added gentoo portage directory

This commit is contained in:
maroy 2005-09-23 14:16:18 +00:00
parent 39be3f99e3
commit 584aa03bdd
64 changed files with 78502 additions and 0 deletions

View file

@ -0,0 +1,6 @@
MD5 9dd6a3434f7eaef06fb2956937bbfe2c libodbc++-0.2.3-r2.ebuild 2335
MD5 178bef12f773384d7586dd35c1ec0125 files/libodbc++-no-thread-dmaccess-mutex-fix.patch 498
MD5 fe58a608d688d22afe285174f283a89e files/libodbc++-no-namespace-closing-colon.patch 4840
MD5 398c2a40f5ea13cadbb9c297488ef43f files/libodbc++-0.2.3-to-cvs-20050404.patch 3249529
MD5 0aab8e76fcf033af346511bb1fef5f90 files/libodbc++-dont-install-some-docs.patch 6037
MD5 76859551271b481b467298625eca2fbf files/digest-libodbc++-0.2.3-r2 67

View file

@ -0,0 +1 @@
MD5 92cb6171e5235324c710d89cd271eff9 libodbc++-0.2.3.tar.gz 450097

View file

@ -0,0 +1,180 @@
diff -Naur libodbc++-0.2.3-20050404/doc/Makefile.am libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am
--- libodbc++-0.2.3-20050404/doc/Makefile.am 2001-06-12 12:38:12.000000000 +0200
+++ libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am 2005-04-04 21:16:50.447164392 +0200
@@ -17,41 +17,6 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-instdoc_dir=@docdir@/@PACKAGE@-@VERSION@/INSTALL
-
-instdoc_name=INSTALL
-
SUBDIRS=progref
-all-local: $(instdoc_name)
-
-$(instdoc_name): $(instdoc_name).sgml
- test -z "$(db2html)" && mkdir $@ || $(db2html) $<
-
-maintainer-clean-local:
- rm -rf $(instdoc_name)
-
-clean-local:
- rm -rf $(instdoc_name).junk DBTOHTML_OUTPUT_DIR*
-
-dist-hook: all-local
- cp -r $(srcdir)/$(instdoc_name) $(distdir)
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(instdoc_dir) $(DESTDIR)$(instdoc_dir)/stylesheet-images
- for i in $(srcdir)/$(instdoc_name)/*; do \
- fn=`basename $$i` \
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/$$fn; \
- done
- for i in $(srcdir)/$(instdoc_name)/stylesheet-images/*; do \
- fn=`basename $$i` \
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/stylesheet-images/$$fn; \
- done
-
-uninstall-local:
- if test -d $(DESTDIR)$(instdoc_dir); then \
- rm -rf $(DESTDIR)$(instdoc_dir)/*; \
- rmdir $(DESTDIR)$(instdoc_dir) || true; \
- fi
-
-EXTRA_DIST=$(instdoc_name).sgml
+EXTRA_DIST=INSTALL.sgml
diff -Naur libodbc++-0.2.3-20050404/doc/Makefile.in libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.in
--- libodbc++-0.2.3-20050404/doc/Makefile.in 2005-04-04 18:21:26.000000000 +0200
+++ libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.in 2005-04-04 21:16:50.447164392 +0200
@@ -174,13 +174,9 @@
target_alias = @target_alias@
zip = @zip@
-instdoc_dir = @docdir@/@PACKAGE@-@VERSION@/INSTALL
-
-instdoc_name = INSTALL
-
SUBDIRS = progref
-EXTRA_DIST = $(instdoc_name).sgml
+EXTRA_DIST = INSTALL.sgml
subdir = doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -382,12 +378,9 @@
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
check-am: all-am
check: check-recursive
-all-am: Makefile all-local
+all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -417,7 +410,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-rm -f Makefile
@@ -432,7 +425,7 @@
info-am:
-install-data-am: install-data-local
+install-data-am:
install-exec-am:
@@ -444,8 +437,7 @@
maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
- maintainer-clean-local
+maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
@@ -459,59 +451,27 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-info-am
uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \
- check-am clean clean-generic clean-libtool clean-local \
- clean-recursive ctags ctags-recursive distclean \
- distclean-generic distclean-libtool distclean-recursive \
- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
- info-recursive install install-am install-data install-data-am \
- install-data-local install-data-recursive install-exec \
- install-exec-am install-exec-recursive install-info \
- install-info-am install-info-recursive install-man \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+ clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+ distclean-recursive distclean-tags distdir dvi dvi-am \
+ dvi-recursive info info-am info-recursive install install-am \
+ install-data install-data-am install-data-recursive \
+ install-exec install-exec-am install-exec-recursive \
+ install-info install-info-am install-info-recursive install-man \
install-recursive install-strip installcheck installcheck-am \
installdirs installdirs-am installdirs-recursive \
maintainer-clean maintainer-clean-generic \
- maintainer-clean-local maintainer-clean-recursive mostlyclean \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
- tags-recursive uninstall uninstall-am uninstall-info-am \
- uninstall-info-recursive uninstall-local uninstall-recursive
-
-
-all-local: $(instdoc_name)
-
-$(instdoc_name): $(instdoc_name).sgml
- test -z "$(db2html)" && mkdir $@ || $(db2html) $<
-
-maintainer-clean-local:
- rm -rf $(instdoc_name)
-
-clean-local:
- rm -rf $(instdoc_name).junk DBTOHTML_OUTPUT_DIR*
-
-dist-hook: all-local
- cp -r $(srcdir)/$(instdoc_name) $(distdir)
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(instdoc_dir) $(DESTDIR)$(instdoc_dir)/stylesheet-images
- for i in $(srcdir)/$(instdoc_name)/*; do \
- fn=`basename $$i` \
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/$$fn; \
- done
- for i in $(srcdir)/$(instdoc_name)/stylesheet-images/*; do \
- fn=`basename $$i` \
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/stylesheet-images/$$fn; \
- done
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+ uninstall uninstall-am uninstall-info-am \
+ uninstall-info-recursive uninstall-recursive
-uninstall-local:
- if test -d $(DESTDIR)$(instdoc_dir); then \
- rm -rf $(DESTDIR)$(instdoc_dir)/*; \
- rmdir $(DESTDIR)$(instdoc_dir) || true; \
- fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View file

@ -0,0 +1,130 @@
diff -Naur libodbc++-0.2.3/include/odbc++/callablestatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h
--- libodbc++-0.2.3/include/odbc++/callablestatement.h 2003-03-20 16:52:27.000000000 +0100
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h 2005-01-18 14:47:32.761605624 +0100
@@ -160,7 +160,7 @@
};
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_CALLABLESTATEMENT_H
diff -Naur libodbc++-0.2.3/include/odbc++/connection.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h
--- libodbc++-0.2.3/include/odbc++/connection.h 2001-06-12 12:38:16.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h 2005-01-18 14:47:41.210321224 +0100
@@ -204,7 +204,7 @@
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_CONNECTION_H
diff -Naur libodbc++-0.2.3/include/odbc++/databasemetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h
--- libodbc++-0.2.3/include/odbc++/databasemetadata.h 2001-06-12 12:38:17.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h 2005-01-18 14:47:44.922756848 +0100
@@ -1333,7 +1333,7 @@
};
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_DATABASEMETADATA_H
diff -Naur libodbc++-0.2.3/include/odbc++/drivermanager.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h
--- libodbc++-0.2.3/include/odbc++/drivermanager.h 2001-06-12 12:38:17.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h 2005-01-18 14:47:48.704181984 +0100
@@ -147,7 +147,7 @@
-};
+}
#endif // __ODBCXX_DRIVERMANAGER_H
diff -Naur libodbc++-0.2.3/include/odbc++/errorhandler.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h
--- libodbc++-0.2.3/include/odbc++/errorhandler.h 2001-06-12 12:38:18.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h 2005-01-18 14:47:53.838401464 +0100
@@ -127,6 +127,6 @@
};
-}; // namespace odbc
+} // namespace odbc
#endif
diff -Naur libodbc++-0.2.3/include/odbc++/preparedstatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h
--- libodbc++-0.2.3/include/odbc++/preparedstatement.h 2003-05-09 10:45:48.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h 2005-01-18 14:47:57.663819912 +0100
@@ -211,6 +211,6 @@
};
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_PREPAREDSTATEMENT_H
diff -Naur libodbc++-0.2.3/include/odbc++/resultset.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h
--- libodbc++-0.2.3/include/odbc++/resultset.h 2001-06-12 12:38:19.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h 2005-01-18 14:48:01.966165856 +0100
@@ -619,7 +619,7 @@
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_RESULTSET_H
diff -Naur libodbc++-0.2.3/include/odbc++/resultsetmetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h
--- libodbc++-0.2.3/include/odbc++/resultsetmetadata.h 2001-06-12 12:38:20.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h 2005-01-18 14:48:05.372647992 +0100
@@ -176,7 +176,7 @@
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_RESULTSETMETADATA_H
diff -Naur libodbc++-0.2.3/include/odbc++/statement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h
--- libodbc++-0.2.3/include/odbc++/statement.h 2003-03-20 16:52:32.000000000 +0100
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h 2005-01-18 14:48:11.589702856 +0100
@@ -260,7 +260,7 @@
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_STATEMENT_H
diff -Naur libodbc++-0.2.3/include/odbc++/threads.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h
--- libodbc++-0.2.3/include/odbc++/threads.h 2001-06-12 12:38:20.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h 2005-01-18 14:48:16.409970064 +0100
@@ -65,7 +65,7 @@
}
};
-}; //namespace odbc
+} //namespace odbc
// macro used all over the place
#define ODBCXX_LOCKER(mut) odbc::Locker _locker(mut)
diff -Naur libodbc++-0.2.3/include/odbc++/types.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h
--- libodbc++-0.2.3/include/odbc++/types.h 2003-06-17 12:08:02.000000000 +0200
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h 2005-01-18 14:48:22.560035112 +0100
@@ -791,7 +791,7 @@
}
};
-}; // namespace odbc
+} // namespace odbc
#endif // __ODBCXX_TYPES_H

View file

@ -0,0 +1,14 @@
diff -Naur libodbc++-0.2.3-20050404/src/drivermanager.cpp libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp
--- libodbc++-0.2.3-20050404/src/drivermanager.cpp 2005-02-27 23:37:23.000000000 +0100
+++ libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp 2005-04-04 18:35:25.725465880 +0200
@@ -87,8 +87,10 @@
}
}
+#ifdef ODBCXX_ENABLE_THREADS
// remove the mutex as we can't rely on static destructors
DMAccessMutex(1);
+#endif
}

View file

@ -0,0 +1,82 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit eutils flag-o-matic
DESCRIPTION="Libodbc++ is a c++ class library that provides a subset of the well-known JDBC 2.0(tm) and runs on top of ODBC."
SRC_URI="mirror://sourceforge/libodbcxx/${P}.tar.gz"
HOMEPAGE="http://libodbcxx.sourceforge.net/"
LICENSE="LGPL-2"
DEPEND="dev-db/unixODBC
sys-libs/libtermcap-compat"
KEYWORDS="~x86 ~ppc ~hppa ~alpha ~amd64"
IUSE="qt"
SLOT=0
SB="${S}-build"
SB_MT="${S}-build-mt"
SB_QT="${S}-build_qt"
SB_QT_MT="${S}-build_qt-mt"
src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/libodbc++-0.2.3-to-cvs-20050404.patch
epatch ${FILESDIR}/libodbc++-no-namespace-closing-colon.patch
epatch ${FILESDIR}/libodbc++-no-thread-dmaccess-mutex-fix.patch
epatch ${FILESDIR}/libodbc++-dont-install-some-docs.patch
# toch the programmers reference stamp, so that it is not re-generated
touch doc/progref/progref-stamp
}
src_compile() {
local commonconf
commonconf="--with-odbc=/usr --without-tests"
commonconf="${commonconf} --enable-static --enable-shared"
# " --enable-threads"
if ! has ccache FEATURES; then
einfo "ccache would really help you compiling this package..."
fi
export ECONF_SOURCE="${S}"
append-flags -DODBCXX_DISABLE_READLINE_HACK
buildlist="${SB} ${SB_MT}"
use qt && buildlist="${buildlist} $SB_QT $SB_QT_MT"
for sd in ${buildlist}; do
mkdir -p "${sd}"
cd "${sd}"
commonconf2=''
LIBS=''
[ "${sd}" == "${SB_MT}" -o "${sd}" == "${SB_QT_MT}" ] && commonconf2="${commonconf2} --enable-threads"
[ "${sd}" == "${SB_QT}" -o "${sd}" == "${SB_QT_MT}" ] && commonconf2="${commonconf2} --with-qt"
[ "${sd}" == "${SB}" ] && commonconf2="${commonconf2} --with-isqlxx"
[ "${sd}" == "${SB_QT}" ] && commonconf2="${commonconf2} --with-qtsqlxx"
export LIBS
# using without-qt breaks the build
#--without-qt \
libtoolize --copy --force
econf \
${commonconf} \
${commonconf2} \
|| die "econf failed"
emake || die "emake failed"
done
}
src_install () {
cd ${S}
dodoc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README THANKS TODO
buildlist="${SB} ${SB_MT}"
use qt && buildlist="${buildlist} $SB_QT $SB_QT_MT"
for sd in ${buildlist}; do
cd ${sd}
make DESTDIR=${D} install || die "make install failed"
done
}

View file

@ -0,0 +1,6 @@
MD5 c98236a5a9e80d523bd9ae18b85d92c7 xmlrpc++-0.7.ebuild 1046
MD5 9c03b31bd18ec67ca2d1a38ea5e0da59 files/digest-xmlrpc++-0.7 62
MD5 30ffa4ae3a5736ec63cb3d72867211a2 files/xmlrpc++-automake.patch 7756
MD5 1bfb17903af3f417349ffbb38db5abc0 files/incorrect_XmlRpcValue_struct_tm_conversion.patch 1207
MD5 b5bdda7867960ddfb6530224a2e1dc88 files/uninitialised_XmlRpcSource_ssl_ssl.patch 423
MD5 ec8a71135df6f24e75e41b0f8b27556b files/xmlrpc++-0.7-to-cvs-20040713.patch 79370

View file

@ -0,0 +1 @@
MD5 d88f0f9c36d938316d672d16f6c37d7e xmlrpc++0.7.tar.gz 64037

View file

@ -0,0 +1,31 @@
diff -Nur xmlrpc++/src/XmlRpcValue.cpp x/src/XmlRpcValue.cpp
--- xmlrpc++/src/XmlRpcValue.cpp 2003-06-06 20:13:28.000000000 +0200
+++ x/src/XmlRpcValue.cpp 2004-12-13 21:02:39.505001617 +0100
@@ -390,6 +390,7 @@
return false;
t.tm_year -= 1900;
+ t.tm_mon -= 1;
t.tm_isdst = -1;
_type = TypeDateTime;
_value.asTime = new struct tm(t);
@@ -402,7 +403,7 @@
struct tm* t = _value.asTime;
char buf[20];
snprintf(buf, sizeof(buf)-1, "%04d%02d%02dT%02d:%02d:%02d",
- 1900+t->tm_year,t->tm_mon,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
+ 1900+t->tm_year,1+t->tm_mon,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
buf[sizeof(buf)-1] = 0;
std::string xml = VALUE_TAG;
@@ -553,8 +554,8 @@
{
struct tm* t = _value.asTime;
char buf[20];
- snprintf(buf, sizeof(buf)-1, "%4d%02d%02dT%02d:%02d:%02d",
- t->tm_year,t->tm_mon,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
+ snprintf(buf, sizeof(buf)-1, "%04d%02d%02dT%02d:%02d:%02d",
+ 1900+t->tm_year,1+t->tm_mon,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
buf[sizeof(buf)-1] = 0;
os << buf;
break;

View file

@ -0,0 +1,11 @@
diff -Nur xmlrpc++/src/XmlRpcSource.cpp x/src/XmlRpcSource.cpp
--- xmlrpc++/src/XmlRpcSource.cpp 2004-04-13 22:21:59.000000000 +0700
+++ x/src/XmlRpcSource.cpp 2004-07-14 12:26:28.227768848 +0700
@@ -9,6 +9,7 @@
XmlRpcSource::XmlRpcSource(int fd /*= -1*/, bool deleteOnClose /*= false*/)
: _fd(fd), _deleteOnClose(deleteOnClose), _keepOpen(false)
{
+ _ssl_ssl = NULL;
}
XmlRpcSource::~XmlRpcSource()

View file

@ -0,0 +1,252 @@
diff -Naur xmlrpc++/Makefile xmlrpc++-automake/Makefile
--- xmlrpc++/Makefile 2004-04-19 20:53:00.000000000 +0700
+++ xmlrpc++-automake/Makefile 1970-01-01 07:00:00.000000000 +0700
@@ -1,71 +0,0 @@
-# makefile written for gnu make
-CXX = g++
-SRC = ./src
-SHARED = -shared
-CPPFLAGS = -I$(SRC)
-DEBUG = -g
-OPTIMIZE = -O2
-GCCWARN = -Wall -Wstrict-prototypes
-CXXFLAGS = $(DEBUG) $(GCCWARN) $(OPTIMIZE) $(INCLUDES)
-VERSION = 0.8
-
-DESTDIR =
-prefix = /usr
-MKDIR = mkdir -p
-CP = cp
-LN = ln -s
-
-LIB = ./libXmlRpc.a
-LIBALT = ./libxmlrpc++.a
-SO = ./libxmlrpc++.so.$(VERSION)
-
-# Add your system-dependent network libs here. These are
-# only used to build the tests (your application will need them too).
-# Linux: none
-# Solaris: -lsocket -lnsl
-#SYSTEMLIBS = -lsocket -lnsl
-SYSTEMLIBS =
-LDLIBS = $(LIB) $(SYSTEMLIBS)
-
-OBJ = $(SRC)/XmlRpcClient.o $(SRC)/XmlRpcDispatch.o \
- $(SRC)/XmlRpcServer.o $(SRC)/XmlRpcServerConnection.o \
- $(SRC)/XmlRpcServerMethod.o $(SRC)/XmlRpcSocket.o $(SRC)/XmlRpcSource.o \
- $(SRC)/XmlRpcUtil.o $(SRC)/XmlRpcValue.o
-
-all: $(LIB) $(SO) tests
-
-$(LIB): $(OBJ)
- $(AR) $(ARFLAGS) $(LIB) $(OBJ)
- cp $(LIB) $(LIBALT)
-
-$(SO): $(OBJ)
- $(CXX) -o $(SO) $(SHARED) $(OBJ)
-
-
-tests: $(LIB)
- cd test && $(MAKE) CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" SYSTEMLIBS="$(SYSTEMLIBS)"
-
-doc doxygen:
- cd src && doxygen Doxyfile
-
-distclean: clean
-
-clean:
- rm -f $(SRC)/*.o
- rm -f $(SRC)/*~
- rm -f $(LIB) $(LIBALT) $(SO)
- rm -f build
- cd test && $(MAKE) clean
-
-install:
- $(MKDIR) $(DESTDIR)$(prefix)/lib
- $(CP) $(SO) $(LIB) $(DESTDIR)$(prefix)/lib
- $(MKDIR) $(DESTDIR)$(prefix)/include
- $(CP) src/*.h $(DESTDIR)$(prefix)/include
- ( cd $(DESTDIR)$(prefix)/lib; rm -f libxmlrpc++.so; $(LN) $(SO) libxmlrpc++.so )
- # Does not install tests right now
-
-# Debian package make target, in case you want to manually build a package
-# from the distribution.
-deb:
- dpkg-buildpackage -rfakeroot
diff -Naur xmlrpc++/Makefile.am xmlrpc++-automake/Makefile.am
--- xmlrpc++/Makefile.am 1970-01-01 07:00:00.000000000 +0700
+++ xmlrpc++-automake/Makefile.am 2004-07-26 11:54:16.610066768 +0700
@@ -0,0 +1,17 @@
+SUBDIRS = src
+
+EXTRA_DIST = README.html
+
+DOC_DIR=@datadir@/doc/xmlrpc++
+
+doc:
+ cd src && doxygen Doxyfile
+
+install-data-local: doc
+ $(mkinstalldirs) $(DOC_DIR); \
+ for i in doc/html/*; do \
+ if test -r "$$i"; then \
+ fn=`basename $$i` \
+ $(INSTALL_DATA) $$i $(DOC_DIR)/$$fn; \
+ fi; \
+ done
diff -Naur xmlrpc++/autogen.sh xmlrpc++-automake/autogen.sh
--- xmlrpc++/autogen.sh 1970-01-01 07:00:00.000000000 +0700
+++ xmlrpc++-automake/autogen.sh 2004-07-26 11:54:11.578831632 +0700
@@ -0,0 +1,69 @@
+#!/bin/sh
+# Run this to set up the build system: configure, makefiles, etc.
+# (based on the version in enlightenment's cvs)
+
+package="xmlrpc++"
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+cd "$srcdir"
+DIE=0
+
+(autoheader --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "You must have autoconf installed to compile $package."
+ echo "Download the appropriate package for your distribution,"
+ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+ DIE=1
+}
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "You must have autoconf installed to compile $package."
+ echo "Download the appropriate package for your distribution,"
+ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+ DIE=1
+}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "You must have automake installed to compile $package."
+ echo "Download the appropriate package for your system,"
+ echo "or get the source from one of the GNU ftp sites"
+ echo "listed in http://www.gnu.org/order/ftp.html"
+ DIE=1
+}
+
+(libtool --help) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "You must have libtool installed to compile $package."
+ echo "Download the appropriate package for your system,"
+ echo "or get the source from one of the GNU ftp sites"
+ echo "listed in http://www.gnu.org/order/ftp.html"
+ DIE=1
+}
+
+if test "$DIE" -eq 1; then
+ exit 1
+fi
+
+if test -z "$*"; then
+ echo "I am going to run ./configure with no arguments - if you wish "
+ echo "to pass any to it, please specify them on the $0 command line."
+fi
+
+echo "Generating configuration files for $package, please wait...."
+
+echo " aclocal $ACLOCAL_FLAGS"
+aclocal $ACLOCAL_FLAGS
+echo " autoheader"
+autoheader
+echo " libtoolize --automake"
+libtoolize --automake
+echo " automake --add-missing --foreign $AUTOMAKE_FLAGS"
+automake --add-missing --foreign $AUTOMAKE_FLAGS
+echo " autoconf"
+autoconf
+
+$srcdir/configure "$@" && echo
diff -Naur xmlrpc++/configure.in xmlrpc++-automake/configure.in
--- xmlrpc++/configure.in 1970-01-01 07:00:00.000000000 +0700
+++ xmlrpc++-automake/configure.in 2004-07-26 11:54:11.578831632 +0700
@@ -0,0 +1,40 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT(src/XmlRpc.h)
+
+XMLRPC_MAJOR_VERSION=0
+XMLRPC_MINOR_VERSION=8
+XMLRPC_MICRO_VERSION=0
+
+#shared library versioning
+XMLRPC_INTERFACE_AGE=0 # increment if interfaces have been added,
+ # zero if interfaces have changed or been removed
+XMLRPC_BINARY_AGE=0 # increment if binary-compatability is broken
+
+XMLRPC_VERSION=$XMLRPC_MAJOR_VERSION.$XMLRPC_MINOR_VERSION.$XMLRPC_MICRO_VERSION
+
+LT_RELEASE=$XMLRPC_MAJOR_VERSION.$XMLRPC_MINOR_VERSION
+LT_CURRENT=`expr $XMLRPC_MICRO_VERSION - $XMLRPC_INTERFACE_AGE`
+LT_REVISION=$XMLRPC_INTERFACE_AGE
+LT_AGE=`expr $XMLRPC_BINARY_AGE - $XMLRPC_INTERFACE_AGE`
+
+AC_SUBST(LT_RELEASE)
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)
+AC_SUBST(XMLRPC_VERSION)
+
+AM_INIT_AUTOMAKE(libxmlrpc++,$XMLRPC_VERSION)
+
+AM_CONFIG_HEADER(configure.h)
+
+AC_PROG_CXX
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+
+dnl AC_STDC_HEADERS
+AC_CHECK_LIB( socket, socket)
+AC_CHECK_LIB( nsl, gethostbyname)
+AC_CHECK_LIB( ssl, SSL_connect)
+
+AC_OUTPUT(Makefile src/Makefile)
+
diff -Naur xmlrpc++/src/Makefile.am xmlrpc++-automake/src/Makefile.am
--- xmlrpc++/src/Makefile.am 1970-01-01 07:00:00.000000000 +0700
+++ xmlrpc++-automake/src/Makefile.am 2004-07-26 11:54:11.578831632 +0700
@@ -0,0 +1,35 @@
+lib_LTLIBRARIES = libxmlrpc++.la
+
+libxmlrpc___la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
+library_includedir=$(includedir)
+library_include_HEADERS = XmlRpc.h \
+ XmlRpcServer.h \
+ XmlRpcSocket.h \
+ XmlRpcValue.h \
+ XmlRpcClient.h \
+ XmlRpcServerConnection.h \
+ XmlRpcSource.h \
+ XmlRpcDispatch.h \
+ XmlRpcServerMethod.h \
+ XmlRpcUtil.h \
+ XmlRpcThreadedServer.h \
+ XmlRpcException.h \
+ XmlRpcMutex.h \
+ XmlRpcThread.h
+
+libxmlrpc___la_SOURCES = $(library_include_HEADERS) \
+ base64.h \
+ XmlRpcClient.cpp \
+ XmlRpcServerConnection.cpp \
+ XmlRpcSource.cpp \
+ XmlRpcDispatch.cpp \
+ XmlRpcServerMethod.cpp \
+ XmlRpcUtil.cpp \
+ XmlRpcServer.cpp \
+ XmlRpcSocket.cpp \
+ XmlRpcValue.cpp \
+ XmlRpcThreadedServer.cpp \
+ XmlRpcMutex.cpp\
+ XmlRpcThread.cpp
+

View file

@ -0,0 +1,47 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit eutils flag-o-matic
DESCRIPTION="XmlRpc++ is a C++ implementation of the XML-RPC protocol."
SRC_URI="mirror://sourceforge/xmlrpcpp/${PN}${PV}.tar.gz"
HOMEPAGE="http://xmlrpcpp.sourceforge.net/"
LICENSE="LGPL"
DEPEND=""
KEYWORDS="~x86 ~ppc ~hppa ~alpha ~amd64"
IUSE=""
SLOT=0
src_unpack() {
unpack ${A}
cd ${PN}${PV}
epatch ${FILESDIR}/xmlrpc++-0.7-to-cvs-20040713.patch
epatch ${FILESDIR}/xmlrpc++-automake.patch
epatch ${FILESDIR}/uninitialised_XmlRpcSource_ssl_ssl.patch
epatch ${FILESDIR}/incorrect_XmlRpcValue_struct_tm_conversion.patch
sh autogen.sh
}
src_compile() {
cd ${WORKDIR}/${PN}${PV}
econf || die "econf failed"
emake || die "emake failed"
}
src_install () {
cd ${WORKDIR}/${PN}${PV}
dodoc COPYING README.html
emake prefix=${D} \
includedir=${D}/usr/include \
libdir=${D}/usr/lib \
DOC_DIR=${D}/usr/share/doc/${PF} \
install \
|| die "make install failed"
}

View file

@ -0,0 +1,2 @@
MD5 4240a059d8243567ea2b783f05c29c14 PEAR-Calendar-0.5.2.ebuild 317
MD5 f85abc41078747dcbe66b80ddbfea88c files/digest-PEAR-Calendar-0.5.2 62

View file

@ -0,0 +1,13 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit php-pear-r1
DESCRIPTION="A package for building Calendar data structures (irrespective of
output)"
LICENSE="PHP"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""

View file

@ -0,0 +1 @@
MD5 26e2dedc175fd5056856b1fee6c0415a Calendar-0.5.2.tgz 60164

View file

@ -0,0 +1,2 @@
MD5 e0f58b576c8dc7b50a16cc8ab4ed5295 PEAR-File-1.2.0.ebuild 244
MD5 dfbc729e39566a4af97ca144c293a308 files/digest-PEAR-File-1.2.0 58

View file

@ -0,0 +1,12 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit php-pear-r1
DESCRIPTION="Common file and directory routines"
LICENSE="PHP"
SLOT="0"
KEYWORDS="~sparc ~x86"
IUSE=""

View file

@ -0,0 +1 @@
MD5 40ccd2236328fbb2475ba74ea575787d File-1.2.0.tgz 15450

View file

@ -0,0 +1,2 @@
MD5 790c4721e6436b79a12dada33b5391fa PEAR-File_Find-0.3.1.ebuild 289
MD5 7ff24f071f24225d832b6b7a8ef4bf36 files/digest-PEAR-File_Find-0.3.1 62

View file

@ -0,0 +1,11 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit php-pear-r1
DESCRIPTION="A class that facillitates the search of filesystems."
LICENSE="PHP"
SLOT="0"
KEYWORDS="x86 ~ppc ~sparc alpha ~hppa amd64 ppc64"
IUSE=""

View file

@ -0,0 +1 @@
MD5 a81c83a7ce53f4fb9bec8a0019fde0e8 File_Find-0.3.1.tgz 4759

View file

@ -0,0 +1,2 @@
MD5 64e1cc953c0f89144e5865d9e95e0405 PEAR-HTML_QuickForm-3.2.4.ebuild 523
MD5 4273f257f8706d090b9dbf9856189504 files/digest-PEAR-HTML_QuickForm-3.2.4 68

View file

@ -0,0 +1,16 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit php-pear-r1
DESCRIPTION="The PEAR::HTML_QuickForm package provides methods for creating, validating, processing HTML forms."
LICENSE="PHP"
SLOT="0"
KEYWORDS="~x86 ~sparc ~ppc ~ia64 ~amd64"
DEPEND=">=dev-php/PEAR-HTML_Common-1.2.1
dev-php/PEAR-HTML_Template_Flexy
dev-php/PEAR-HTML_Template_IT"
# the last two would be option on doc? but I think we should put the docs there
# anyway
IUSE=""

View file

@ -0,0 +1 @@
MD5 63e41c52445c3c975a4d81a801fcd1c6 HTML_QuickForm-3.2.4.tgz 92946

View file

@ -0,0 +1,2 @@
MD5 20e860b9eaed5ae49ab9e7fc3fc2edf3 PEAR-XML_Parser-1.2.6.ebuild 317
MD5 1000e0267dc48ce81fa7d8085e801b78 files/digest-PEAR-XML_Parser-1.2.6 64

View file

@ -0,0 +1,14 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit php-pear-r1
DESCRIPTION="XML parsing class based on PHP's SAX parser"
LICENSE="PHP"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND="dev-php/PEAR-PEAR"

View file

@ -0,0 +1 @@
MD5 96ebc0fc2f349249f1455389797e72a4 XML_Parser-1.2.6.tgz 12944

View file

@ -0,0 +1,4 @@
MD5 1d1904de3d5f6dd756279f300a4ae35d cppunit-1.10.2-r1.ebuild 1081
MD5 b437cd880b8b07ee37ff84cb9f912bed .cppunit-1.10.2-r1.ebuild.swp 12288
MD5 2f66c625e1f7de63458cfb987e9b0d9d files/digest-cppunit-1.10.2-r1 66
MD5 bc589fdb15867ba23639c300f62e70f5 files/cppunit-1.10.2-nostandalone.patch 3175

View file

@ -0,0 +1,41 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit eutils
IUSE="doc"
DESCRIPTION="CppUnit is the C++ port of the famous JUnit framework for unit testing."
HOMEPAGE="http://cppunit.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ppc sparc x86"
RESTRICT="maketest"
DEPEND="doc? ( app-doc/doxygen )
media-gfx/graphviz"
src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/cppunit-1.10.2-nostandalone.patch
}
src_compile() {
econf `use_enable doc doxygen` || die "configure failed"
emake || die
#make check || die
}
src_install() {
make DESTDIR=${D} install || die
dodoc AUTHORS BUGS COPYING NEWS README THANKS TODO
# the package automatically puts its docs into /usr/share/cppunit
# move them to the standard location and clean up
mv ${D}/usr/share/cppunit/html ${D}/usr/share/doc/${PF}
rm -rf ${D}/usr/share/cppunit
}

View file

@ -0,0 +1,100 @@
diff -Naur cppunit-1.10.2/include/cppunit/XmlOutputter.h cppunit-1.10.2-nostandalone/include/cppunit/XmlOutputter.h
--- cppunit-1.10.2/include/cppunit/XmlOutputter.h 2002-09-17 01:31:29.000000000 +0700
+++ cppunit-1.10.2-nostandalone/include/cppunit/XmlOutputter.h 2004-07-24 15:44:00.816814688 +0700
@@ -94,6 +94,16 @@
virtual void addSuccessfulTests( FailedTests &failedTests,
XmlElement *rootNode );
+ /*! \brief set the output document as standalone or not.
+ *
+ * For the output document, specify wether it's a standalone XML
+ * document, or not.
+ *
+ * \param standalone if true, the output will be specified as standalone.
+ * if false, it will be not.
+ */
+ virtual void setStandalone(bool standalone);
+
/*! \brief Adds the statics element to the root node.
*
* Creates a new element containing statistics data and adds it to the root element.
diff -Naur cppunit-1.10.2/include/cppunit/tools/XmlDocument.h cppunit-1.10.2-nostandalone/include/cppunit/tools/XmlDocument.h
--- cppunit-1.10.2/include/cppunit/tools/XmlDocument.h 2002-08-29 14:36:50.000000000 +0700
+++ cppunit-1.10.2-nostandalone/include/cppunit/tools/XmlDocument.h 2004-07-24 15:39:03.516011280 +0700
@@ -42,6 +42,9 @@
std::string styleSheet() const;
void setStyleSheet( const std::string &styleSheet = "" );
+ bool standalone(void) const;
+ void setStandalone(bool standalone);
+
void setRootElement( XmlElement *rootElement );
XmlElement &rootElement() const;
@@ -58,6 +61,7 @@
std::string m_encoding;
std::string m_styleSheet;
XmlElement *m_rootElement;
+ bool m_standalone;
};
diff -Naur cppunit-1.10.2/src/cppunit/XmlDocument.cpp cppunit-1.10.2-nostandalone/src/cppunit/XmlDocument.cpp
--- cppunit-1.10.2/src/cppunit/XmlDocument.cpp 2002-08-28 04:51:18.000000000 +0700
+++ cppunit-1.10.2-nostandalone/src/cppunit/XmlDocument.cpp 2004-07-24 15:40:03.344915904 +0700
@@ -11,6 +11,7 @@
, m_styleSheet( styleSheet )
{
setEncoding( encoding );
+ m_standalone = true;
}
@@ -67,11 +68,29 @@
}
+bool
+XmlDocument::standalone() const
+{
+ return m_standalone;
+}
+
+
+void
+XmlDocument::setStandalone(bool standalone)
+{
+ m_standalone = standalone;
+}
+
+
std::string
XmlDocument::toString() const
{
std::string asString = "<?xml version=\"1.0\" "
- "encoding='" + m_encoding + "' standalone='yes' ?>\n";
+ "encoding='" + m_encoding + "'";
+ if (m_standalone) {
+ asString += " standalone='yes'";
+ }
+ asString += " ?>\n";
if ( !m_styleSheet.empty() )
asString += "<?xml-stylesheet type=\"text/xsl\" href=\"" + m_styleSheet + "\"?>\n";
diff -Naur cppunit-1.10.2/src/cppunit/XmlOutputter.cpp cppunit-1.10.2-nostandalone/src/cppunit/XmlOutputter.cpp
--- cppunit-1.10.2/src/cppunit/XmlOutputter.cpp 2003-03-15 15:55:29.000000000 +0700
+++ cppunit-1.10.2-nostandalone/src/cppunit/XmlOutputter.cpp 2004-07-24 15:42:59.090198560 +0700
@@ -43,6 +43,13 @@
}
+void
+XmlOutputter::setStandalone(bool standalone)
+{
+ m_xml->setStandalone(standalone);
+}
+
+
void
XmlOutputter::write()
{

View file

@ -0,0 +1 @@
MD5 0bc06cd219410f7d4f6bbfc9bdd7c824 cppunit-1.10.2.tar.gz 723340

View file

@ -0,0 +1,4 @@
MD5 0e7c2f291da9f11b39a4cf459b2a22f8 lcov-1.3.ebuild 786
MD5 b29720b4a135962c0738f5b8181c8db1 files/lcov-1.3-geninfo-regexp.patch 330
MD5 fef7da910c51fb5fc571bb8370ae6ac0 files/lcov-1.3-install-to-prefix.patch 464
MD5 074a9de30fca555be8ce86957c10b960 files/digest-lcov-1.3 59

View file

@ -0,0 +1 @@
MD5 ee9e3811b6b3a4c604115a8d1b8f13a7 lcov-1.3.tar.gz 88539

View file

@ -0,0 +1,12 @@
diff -Naur lcov-1.3/bin/geninfo lcov-1.3-regexp-fix/bin/geninfo
--- lcov-1.3/bin/geninfo 2004-04-29 00:57:11.000000000 +0700
+++ lcov-1.3-regexp-fix/bin/geninfo 2004-08-02 12:51:48.996719688 +0700
@@ -707,7 +707,7 @@
foreach (@list)
{
- if (/\/$filename$/)
+ if (m,/\Q$filename\E$,)
{
@result = (@result, $_);
}

View file

@ -0,0 +1,13 @@
--- lcov-1.3/Makefile 2004-04-28 19:57:09.000000000 +0200
+++ lcov-1.3-livesupport/Makefile 2005-07-22 12:12:18.000000000 +0200
@@ -15,8 +15,8 @@
RELEASE := 1
DATE := $(shell date +%Y-%m-%d)
-BIN_DIR := $(PREFIX)/usr/bin
-MAN_DIR := $(PREFIX)/usr/share/man
+BIN_DIR := $(PREFIX)/bin
+MAN_DIR := $(PREFIX)/share/man
TMP_DIR := /tmp/lcov-tmp.$(shell echo $$$$)
FILES := $(wildcard bin/*) $(wildcard man/*) README CHANGES Makefile \
$(wildcard rpm/*)

View file

@ -0,0 +1,37 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit eutils
DESCRIPTION="LCOV is an extension to GCOV, providing HTML output and support for
large projects"
HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ppc sparc x86"
RESTRICT="maketest"
DEPEND="dev-lang/perl"
src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/lcov-1.3-geninfo-regexp.patch
epatch ${FILESDIR}/lcov-1.3-install-to-prefix.patch
}
src_compile() {
emake || die
#make check || die
}
src_install() {
# by setting PREFIX we can tell the Makefile where to install
export PREFIX=${D}/usr
emake install || die
dodoc CHANGES README
}

View file

@ -0,0 +1,7 @@
MD5 230cec8bdd27a33315b67c3eb5cd59f7 gst-plugins-0.8.10-r1.ebuild 2151
MD5 14463cc56953050a6161f55a1abb9228 files/adder-query.patch 1754
MD5 d05851db15053a9e5b1c114dfecabbf4 files/adder-duration-fix.patch 1102
MD5 36f4a0bacb3d1f85c78525f4a1e46fe5 files/switch-fix.patch 1434
MD5 9f833bb88c0c1d6b9c2b0bdf20f47e4e files/adder-caps-property.patch 9086
MD5 e5a6b80e2dfc0bf36559f4663fb90e25 files/digest-gst-plugins-0.8.10-r1 72
MD5 0fd59e0dd0c56f118ccc1a5309cb69b8 files/typefind-smil.patch 2783

View file

@ -0,0 +1,290 @@
--- gst-plugins-0.8.10/gst/adder/gstadder.h 2005-05-17 10:41:43.000000000 +0200
+++ gst-plugins-0.8.10-livesupport/gst/adder/gstadder.h 2005-08-26 10:58:46.000000000 +0200
@@ -65,6 +65,8 @@
GstPad *srcpad;
+ GstCaps *caps;
+
/* keep track of the sinkpads */
guint numsinkpads;
GSList *input_channels;
--- gst-plugins-0.8.10/gst/adder/gstadder.c 2005-06-14 18:38:01.000000000 +0200
+++ gst-plugins-0.8.10-livesupport/gst/adder/gstadder.c 2005-08-26 12:07:30.000000000 +0200
@@ -64,7 +64,8 @@
{
ARG_0,
ARG_NUM_PADS,
- ARG_EOS
+ ARG_EOS,
+ ARG_CAPS
/* FILL ME */
};
@@ -86,6 +87,7 @@
static void gst_adder_class_init (GstAdderClass * klass);
static void gst_adder_init (GstAdder * adder);
+static void gst_adder_dispose (GObject * object);
static void gst_adder_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
@@ -101,6 +103,8 @@
/* we do need a loop function */
static void gst_adder_loop (GstElement * element);
+static void gst_adder_set_caps(GstAdder * adder,
+ const GstCaps * caps);
static GstCaps *gst_adder_get_caps (GstPad * pad);
static GstElementClass *parent_class = NULL;
@@ -131,13 +135,11 @@
static GstPadLinkReturn
gst_adder_link (GstPad * pad, const GstCaps * caps)
{
- GstAdder *adder;
- const char *media_type;
- const GList *pads;
- GstStructure *structure;
- GstPadLinkReturn ret;
- GstElement *element;
- const GSList *links;
+ GstAdder * adder;
+ const GList * pads;
+ GstPadLinkReturn ret;
+ GstElement * element;
+ GSList * links;
g_return_val_if_fail (caps != NULL, GST_PAD_LINK_REFUSED);
g_return_val_if_fail (pad != NULL, GST_PAD_LINK_REFUSED);
@@ -145,41 +147,42 @@
element = GST_PAD_PARENT (pad);
adder = GST_ADDER (element);
- pads = gst_element_get_pad_list (element);
- while (pads) {
- GstPad *otherpad = GST_PAD (pads->data);
-
- if (otherpad != pad) {
- ret = gst_pad_try_set_caps (otherpad, caps);
- if (ret == GST_PAD_LINK_REFUSED ||
- (otherpad == adder->srcpad && GST_PAD_LINK_FAILED (ret))) {
- return ret;
+ if (adder->caps != NULL) {
+ pads = gst_element_get_pad_list (element);
+ while (pads) {
+ GstPad *otherpad = GST_PAD (pads->data);
+
+ if (otherpad != pad) {
+ ret = gst_pad_try_set_caps (otherpad, adder->caps);
+ if (ret == GST_PAD_LINK_REFUSED ||
+ (otherpad == adder->srcpad && GST_PAD_LINK_FAILED (ret))) {
+ return ret;
+ }
}
+ pads = g_list_next (pads);
+ }
+ } else {
+ pads = gst_element_get_pad_list (element);
+ while (pads) {
+ GstPad *otherpad = GST_PAD (pads->data);
+
+ if (otherpad != pad) {
+ ret = gst_pad_try_set_caps (otherpad, caps);
+ if (ret == GST_PAD_LINK_REFUSED ||
+ (otherpad == adder->srcpad && GST_PAD_LINK_FAILED (ret))) {
+ return ret;
+ }
+ }
+ pads = g_list_next (pads);
}
- pads = g_list_next (pads);
- }
- structure = gst_caps_get_structure (caps, 0);
- media_type = gst_structure_get_name (structure);
- if (strcmp (media_type, "audio/x-raw-int") == 0) {
- GST_DEBUG ("parse_caps sets adder to format int");
- adder->format = GST_ADDER_FORMAT_INT;
- gst_structure_get_int (structure, "width", &adder->width);
- gst_structure_get_int (structure, "depth", &adder->depth);
- gst_structure_get_int (structure, "endianness", &adder->endianness);
- gst_structure_get_boolean (structure, "signed", &adder->is_signed);
- gst_structure_get_int (structure, "channels", &adder->channels);
- gst_structure_get_int (structure, "rate", &adder->rate);
- } else if (strcmp (media_type, "audio/x-raw-float") == 0) {
- GST_DEBUG ("parse_caps sets adder to format float");
- adder->format = GST_ADDER_FORMAT_FLOAT;
- gst_structure_get_int (structure, "width", &adder->width);
- gst_structure_get_int (structure, "channels", &adder->channels);
- gst_structure_get_int (structure, "rate", &adder->rate);
+ /* set our caps, if all try_set_caps succeeded */
+ gst_adder_set_caps(adder, caps);
+
}
for (links = adder->input_channels;
- links != NULL; links = g_slist_next (links)) {
+ links != NULL; links = g_slist_next (links)) {
GstAdderInputChannel *input = (GstAdderInputChannel *) links->data;
if (input->sinkpad == pad) {
@@ -200,6 +203,8 @@
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
+ gobject_class->dispose = gst_adder_dispose;
+
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&gst_adder_src_template));
gst_element_class_add_pad_template (gstelement_class,
@@ -217,6 +222,11 @@
"generate an EOS when all input channels did", FALSE,
G_PARAM_READWRITE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CAPS,
+ g_param_spec_pointer ("caps", "pad capabilities",
+ "fix all adder capabilities to supplied value",
+ G_PARAM_READWRITE));
+
gobject_class->get_property = gst_adder_get_property;
gobject_class->set_property = gst_adder_set_property;
@@ -226,6 +236,44 @@
}
static void
+gst_adder_set_caps(GstAdder * adder,
+ const GstCaps * caps)
+{
+ GstStructure * structure;
+ const char * media_type;
+
+ if (adder == NULL || !GST_IS_ADDER(adder)
+ || caps == NULL || !GST_IS_CAPS(caps)) {
+
+ return;
+ }
+ if (adder->caps != NULL) {
+ gst_caps_free(adder->caps);
+ }
+
+ adder->caps = gst_caps_copy(caps);
+
+ structure = gst_caps_get_structure (adder->caps, 0);
+ media_type = gst_structure_get_name (structure);
+ if (strcmp (media_type, "audio/x-raw-int") == 0) {
+ GST_DEBUG ("parse_caps sets adder to format int");
+ adder->format = GST_ADDER_FORMAT_INT;
+ gst_structure_get_int (structure, "width", &adder->width);
+ gst_structure_get_int (structure, "depth", &adder->depth);
+ gst_structure_get_int (structure, "endianness", &adder->endianness);
+ gst_structure_get_boolean (structure, "signed", &adder->is_signed);
+ gst_structure_get_int (structure, "channels", &adder->channels);
+ gst_structure_get_int (structure, "rate", &adder->rate);
+ } else if (strcmp (media_type, "audio/x-raw-float") == 0) {
+ GST_DEBUG ("parse_caps sets adder to format float");
+ adder->format = GST_ADDER_FORMAT_FLOAT;
+ gst_structure_get_int (structure, "width", &adder->width);
+ gst_structure_get_int (structure, "channels", &adder->channels);
+ gst_structure_get_int (structure, "rate", &adder->rate);
+ }
+}
+
+static void
gst_adder_init (GstAdder * adder)
{
adder->srcpad =
@@ -238,6 +286,8 @@
adder->format = GST_ADDER_FORMAT_UNSET;
+ adder->caps = NULL;
+
/* keep track of the sinkpads requested */
adder->numsinkpads = 0;
@@ -246,6 +296,18 @@
adder->eos = FALSE;
}
+static void
+gst_adder_dispose(GObject * object)
+{
+ GstAdder * adder = GST_ADDER(object);
+
+ g_return_if_fail(GST_IS_ADDER(adder));
+ if (adder->caps) {
+ gst_caps_free(adder->caps);
+ }
+ G_OBJECT_CLASS(parent_class)->dispose(object);
+}
+
static GstPad *
gst_adder_request_new_pad (GstElement * element, GstPadTemplate * templ,
const gchar * unused)
@@ -339,6 +401,9 @@
case ARG_EOS:
g_value_set_boolean (value, adder->eos);
break;
+ case ARG_CAPS:
+ g_value_set_pointer (value, adder->caps);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -360,6 +425,9 @@
case ARG_EOS:
adder->eos = g_value_get_boolean (value);
break;
+ case ARG_CAPS:
+ gst_adder_set_caps(adder, g_value_get_pointer(value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -613,23 +681,28 @@
gst_adder_get_caps (GstPad * pad)
{
GstAdder *adder = GST_ADDER (gst_pad_get_parent (pad));
- GstCaps *caps = gst_caps_new_any ();
- GstCaps *tmp, *res;
- GstPad *otherpad;
- const GList *pads;
-
- for (pads = gst_element_get_pad_list (GST_ELEMENT (adder));
- pads != NULL; pads = pads->next) {
- otherpad = GST_PAD (pads->data);
-
- tmp = gst_pad_get_allowed_caps (otherpad);
- res = gst_caps_intersect (caps, tmp);
- gst_caps_free (tmp);
- gst_caps_free (caps);
- caps = res;
- }
- return caps;
+ if (adder->caps != NULL) {
+ return gst_caps_copy(adder->caps);
+ } else {
+ GstCaps *caps = gst_caps_new_any ();
+ GstCaps *tmp, *res;
+ GstPad *otherpad;
+ const GList *pads;
+
+ for (pads = gst_element_get_pad_list (GST_ELEMENT (adder));
+ pads != NULL; pads = pads->next) {
+ otherpad = GST_PAD (pads->data);
+
+ tmp = gst_pad_get_allowed_caps (otherpad);
+ res = gst_caps_intersect (caps, tmp);
+ gst_caps_free (tmp);
+ gst_caps_free (caps);
+ caps = res;
+ }
+
+ return caps;
+ }
}
static gboolean

View file

@ -0,0 +1,29 @@
--- gst-plugins-0.8.9/gst/adder/gstadder.c 2005-06-29 14:45:17.000000000 +0200
+++ gst-plugins-0.8.9-livesupport/gst/adder/gstadder.c 2005-06-29 14:42:05.000000000 +0200
@@ -558,14 +558,19 @@
}
if (valid_inputs > 0 || adder->eos == FALSE) {
+ gint64 delta;
+ gint64 duration;
+
+ delta = (adder->format == GST_ADDER_FORMAT_FLOAT)
+ ? GST_BUFFER_SIZE (buf_out) / adder->width / adder->channels
+ : GST_BUFFER_SIZE (buf_out) * 8 / adder->width / adder->channels;
+ duration = delta * GST_SECOND / adder->rate;
+
GST_BUFFER_TIMESTAMP (buf_out) = adder->timestamp;
- if (adder->format == GST_ADDER_FORMAT_FLOAT)
- adder->offset +=
- GST_BUFFER_SIZE (buf_out) / adder->width / adder->channels;
- else
- adder->offset +=
- GST_BUFFER_SIZE (buf_out) * 8 / adder->width / adder->channels;
- adder->timestamp = adder->offset * GST_SECOND / adder->rate;
+ GST_BUFFER_DURATION (buf_out) = duration;
+
+ adder->offset += delta;
+ adder->timestamp += duration;
/* send it out */
GST_LOG ("pushing buf_out");

View file

@ -0,0 +1,54 @@
--- gst-plugins-0.8.10/gst/adder/gstadder.c 2005-09-07 16:24:18.000000000 +0200
+++ gst-plugins-0.8.10-livesupport/gst/adder/gstadder.c 2005-09-07 16:22:40.000000000 +0200
@@ -107,6 +107,11 @@
const GstCaps * caps);
static GstCaps *gst_adder_get_caps (GstPad * pad);
+static gboolean gst_adder_query(GstPad * pad,
+ GstQueryType type,
+ GstFormat * format,
+ gint64 * value);
+
static GstElementClass *parent_class = NULL;
/* static guint gst_adder_signals[LAST_SIGNAL] = { 0 }; */
@@ -283,6 +288,7 @@
gst_element_set_loop_function (GST_ELEMENT (adder), gst_adder_loop);
gst_pad_set_getcaps_function (adder->srcpad, gst_adder_get_caps);
gst_pad_set_link_function (adder->srcpad, gst_adder_link);
+ gst_pad_set_query_function (adder->srcpad, gst_adder_query);
adder->format = GST_ADDER_FORMAT_UNSET;
@@ -654,6 +660,31 @@
}
+static gboolean gst_adder_query(GstPad * pad,
+ GstQueryType type,
+ GstFormat * format,
+ gint64 * value)
+{
+ GstAdder * adder;
+
+ adder = GST_ADDER(gst_pad_get_parent(pad));
+ if (!GST_IS_ADDER(adder)) {
+ return FALSE;
+ }
+
+ if (pad != adder->srcpad) {
+ return gst_pad_query_default(pad, type, format, value);
+ }
+
+ if (type != GST_QUERY_POSITION || *format != GST_FORMAT_TIME) {
+ return gst_pad_query_default(pad, type, format, value);
+ }
+
+ *value = adder->timestamp;
+ return TRUE;
+}
+
+
static GstElementStateReturn
gst_adder_change_state (GstElement * element)
{

View file

@ -0,0 +1 @@
MD5 99f36ba2b91015a23d3c20a8f424b232 gst-plugins-0.8.10.tar.bz2 2397528

View file

@ -0,0 +1,32 @@
--- gst-plugins-0.8.9/gst/switch/gstswitch.c 2005-04-14 18:26:47.000000000 +0200
+++ gst-plugins-0.8.9-livesupport/gst/switch/gstswitch.c 2005-06-18 11:26:19.000000000 +0200
@@ -241,15 +241,23 @@
GstEvent *event = GST_EVENT (data);
GST_LOG_OBJECT (gstswitch,
- "handling event from active pad %p", switchpad->sinkpad);
+ "handling event of type %d from active pad %p",
+ GST_EVENT_TYPE(GST_EVENT(data)),
+ switchpad->sinkpad);
/* Handling event */
gst_pad_event_default (switchpad->sinkpad, event);
} else {
- /* Pushing active sinkpad data to srcpad */
- GST_LOG_OBJECT (gstswitch,
- "pushing data from active pad %p to %p",
- switchpad->sinkpad, gstswitch->srcpad);
- gst_pad_push (gstswitch->srcpad, data);
+ if (GST_PAD_IS_ACTIVE(GST_PAD_PEER(gstswitch->srcpad))) {
+ /* Pushing active sinkpad data to srcpad */
+ GST_LOG_OBJECT (gstswitch,
+ "pushing data from active pad %p to %p",
+ switchpad->sinkpad, gstswitch->srcpad);
+ gst_pad_push (gstswitch->srcpad, data);
+ } else {
+ /* the peer has become inactive, put us into EOS state */
+ GST_LOG_OBJECT(gstswitch, "peer pad inactivated, going to eos");
+ gst_element_set_eos(GST_ELEMENT(gstswitch));
+ }
}
/* Mark this data as forwarded so that it won't get unrefed on next poll */

View file

@ -0,0 +1,86 @@
--- gst-plugins-0.8.9/gst/typefind/gsttypefindfunctions.c 2005-05-17 10:41:47.000000000 +0200
+++ gst-plugins-0.8.9-livesupport/gst/typefind/gsttypefindfunctions.c 2005-06-22 18:46:33.000000000 +0200
@@ -132,6 +132,66 @@
}
}
+/*** application/smil *********************************************************/
+
+static GstStaticCaps smil_caps = GST_STATIC_CAPS ("application/smil");
+
+#define SMIL_CAPS (gst_static_caps_get(&smil_caps))
+static void
+smil_type_find (GstTypeFind * tf, gpointer unused)
+{
+ guint8 *data = gst_type_find_peek (tf, 0, BUFFER_SIZE);
+ guint pos = 0;
+ guint offset = 0;
+
+ if (data) {
+ /* look for the XMLDec,
+ * see XML spec 2.8, Prolog and Document Type Declaration
+ * http://www.w3.org/TR/2004/REC-xml-20040204/#sec-prolog-dtd
+ */
+ /* we know that BUFFER_SIZE > strlen("<?xml") */
+ if (!(data[0] == '<'
+ && data[1] == '?'
+ && data[2] == 'x'
+ && data[3] == 'm'
+ && data[4] == 'l')) {
+
+ return;
+ }
+
+ data += 5;
+ pos += 5;
+
+ /* look for the first element, it has to be a <smil> element */
+ while (data) {
+ while (*data != '<') {
+ INC_BUFFER;
+ }
+
+ INC_BUFFER;
+ if (!g_ascii_isalpha(*data)) {
+ /* if not alphabetic, it's a PI or an element / attribute declaration
+ * like <?xxx or <!xxx */
+ INC_BUFFER;
+ continue;
+ }
+
+ /* the first normal element
+ * get the next 4 bytes, and look if it's smil */
+ data = gst_type_find_peek(tf, offset + pos, 5);
+ if (!(data[0] == 's'
+ && data[1] == 'm'
+ && data[2] == 'i'
+ && data[3] == 'l')) {
+ return;
+ }
+
+ gst_type_find_suggest(tf, GST_TYPE_FIND_MAXIMUM, SMIL_CAPS);
+ return;
+ }
+ }
+}
+
/*** video/x-fli **************************************************************/
static GstStaticCaps flx_caps = GST_STATIC_CAPS ("video/x-fli");
@@ -1789,6 +1849,7 @@
static gchar *shn_exts[] = { "shn", NULL };
static gchar *ape_exts[] = { "ape", NULL };
static gchar *uri_exts[] = { "ram", NULL };
+ static gchar *smil_exts[] = { "smil", NULL };
static gchar *jpeg_exts[] = { "jpg", "jpe", "jpeg", NULL };
static gchar *gif_exts[] = { "gif", NULL };
static gchar *png_exts[] = { "png", NULL };
@@ -1871,6 +1932,8 @@
utf8_exts, UTF8_CAPS, NULL);
TYPE_FIND_REGISTER (plugin, "text/uri-list", GST_RANK_MARGINAL, uri_type_find,
uri_exts, URI_CAPS, NULL);
+ TYPE_FIND_REGISTER (plugin, "application/smil", GST_RANK_PRIMARY, smil_type_find,
+ smil_exts, SMIL_CAPS, NULL);
TYPE_FIND_REGISTER_RIFF (plugin, "audio/x-wav", GST_RANK_PRIMARY, wav_exts,
"WAVE");
TYPE_FIND_REGISTER (plugin, "audio/x-aiff", GST_RANK_SECONDARY,

View file

@ -0,0 +1,89 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.8.10.ebuild,v 1.10 2005/09/15 11:39:17 agriffis Exp $
# order is important, gnome2 after gst-plugins
inherit gst-plugins gnome2 eutils flag-o-matic libtool
DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="http://gstreamer.net/"
SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="esd alsa oss"
RDEPEND=">=media-libs/gstreamer-0.8.10
>=gnome-base/gconf-2"
DEPEND="${RDEPEND}
>=sys-devel/gettext-0.11.5
>=dev-util/pkgconfig-0.9"
PDEPEND="oss? ( >=media-plugins/gst-plugins-oss-${PV} )
alsa? ( >=media-plugins/gst-plugins-alsa-${PV} )
esd? ( >=media-plugins/gst-plugins-esd-${PV} )"
# we need x for the x overlay to get linked
GST_PLUGINS_BUILD="x xshm"
# overrides the eclass
src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/adder-caps-property.patch
epatch ${FILESDIR}/adder-duration-fix.patch
epatch ${FILESDIR}/adder-query.patch
epatch ${FILESDIR}/switch-fix.patch
epatch ${FILESDIR}/typefind-smil.patch
}
src_compile() {
elibtoolize
# gst doesnt handle optimisations well
strip-flags
replace-flags "-O3" "-O2"
filter-flags "-fprefetch-loop-arrays" # see bug 22249
if use alpha || use amd64 || use ia64 || use hppa; then
append-flags -fPIC
fi
gst-plugins_src_configure
emake || die
}
# override eclass
src_install() {
gnome2_src_install
}
DOCS="AUTHORS INSTALL README RELEASE TODO"
pkg_postinst () {
gnome2_pkg_postinst
gst-plugins_pkg_postinst
echo ""
einfo "The Gstreamer plugins setup has changed quite a bit on Gentoo,"
einfo "applications now should provide the basic plugins needed."
echo ""
einfo "The new seperate plugins are all named 'gst-plugins-<plugin>'."
einfo "To get a listing of currently available plugins execute 'emerge -s gst-plugins-'."
einfo "In most cases it shouldn't be needed though to emerge extra plugins."
}
pkg_postrm() {
gnome2_pkg_postrm
gst-plugins_pkg_postrm
}

View file

@ -0,0 +1,4 @@
MD5 7a549789db883fd2a1fece00159db85b taglib-1.3.1-r3.ebuild 916
MD5 103dd47ff1744397288b44834902e16c files/taglib-1.3.1-memleak-fix2.patch 2514
MD5 5be2e7958dd0c6985fd109659eb90b6b files/taglib-1.3.1-length-in-microseconds.patch 5962
MD5 cc8a58ea8028f3539fcee148baeffcc1 files/digest-taglib-1.3.1-r3 64

View file

@ -0,0 +1 @@
MD5 f5c7c71513ba51b240864d7475a199c0 taglib-1.3.1.tar.gz 734938

View file

@ -0,0 +1,172 @@
--- taglib-1.3.1/taglib/audioproperties.h 2003-11-04 03:48:25.000000000 +0100
+++ taglib-1.3.1-microseconds/taglib/audioproperties.h 2005-06-15 19:27:31.805943362 +0200
@@ -59,11 +59,16 @@
virtual ~AudioProperties();
/*!
- * Returns the lenght of the file in seconds.
+ * Returns the length of the file in seconds (rounded down).
*/
virtual int length() const = 0;
/*!
+ * Returns the fractional part of the length of the file, in microseconds.
+ */
+ virtual int length_microseconds() const = 0;
+
+ /*!
* Returns the most appropriate bit rate for the file in kb/s. For constant
* bitrate formats this is simply the bitrate of the file. For variable
* bitrate formats this is either the average or nominal bitrate.
--- taglib-1.3.1/taglib/flac/flacproperties.h 2004-06-24 21:27:02.000000000 +0200
+++ taglib-1.3.1-microseconds/taglib/flac/flacproperties.h 2005-06-15 19:41:27.176791223 +0200
@@ -62,6 +62,7 @@
// Reimplementations.
virtual int length() const;
+ virtual int length_microseconds() const;
virtual int bitrate() const;
virtual int sampleRate() const;
virtual int channels() const;
--- taglib-1.3.1/taglib/flac/flacproperties.cpp 2004-08-02 16:18:58.000000000 +0200
+++ taglib-1.3.1-microseconds/taglib/flac/flacproperties.cpp 2005-06-15 21:42:48.714138847 +0200
@@ -76,6 +76,11 @@
return d->length;
}
+int FLAC::Properties::length_microseconds() const
+{
+ return 0;
+}
+
int FLAC::Properties::bitrate() const
{
return d->bitrate;
--- taglib-1.3.1/taglib/mpc/mpcproperties.h 2004-07-21 00:30:00.000000000 +0200
+++ taglib-1.3.1-microseconds/taglib/mpc/mpcproperties.h 2005-06-15 19:46:10.845016974 +0200
@@ -56,6 +56,7 @@
// Reimplementations.
virtual int length() const;
+ virtual int length_microseconds() const;
virtual int bitrate() const;
virtual int sampleRate() const;
virtual int channels() const;
--- taglib-1.3.1/taglib/mpc/mpcproperties.cpp 2004-09-09 02:28:18.000000000 +0200
+++ taglib-1.3.1-microseconds/taglib/mpc/mpcproperties.cpp 2005-06-15 21:43:14.322020672 +0200
@@ -71,6 +71,11 @@
return d->length;
}
+int MPC::Properties::length_microseconds() const
+{
+ return 0;
+}
+
int MPC::Properties::bitrate() const
{
return d->bitrate;
--- taglib-1.3.1/taglib/mpeg/mpegproperties.h 2003-11-05 05:29:05.000000000 +0100
+++ taglib-1.3.1-microseconds/taglib/mpeg/mpegproperties.h 2005-06-15 19:33:00.669147926 +0200
@@ -56,6 +56,7 @@
// Reimplementations.
virtual int length() const;
+ virtual int length_microseconds() const;
virtual int bitrate() const;
virtual int sampleRate() const;
virtual int channels() const;
--- taglib-1.3.1/taglib/mpeg/mpegproperties.cpp 2004-08-02 16:18:58.000000000 +0200
+++ taglib-1.3.1-microseconds/taglib/mpeg/mpegproperties.cpp 2005-06-15 20:57:14.538631543 +0200
@@ -41,7 +41,7 @@
File *file;
ReadStyle style;
- int length;
+ long long length;
int bitrate;
int sampleRate;
int channels;
@@ -71,7 +71,12 @@
int MPEG::Properties::length() const
{
- return d->length;
+ return int(d->length / 1000000);
+}
+
+int MPEG::Properties::length_microseconds() const
+{
+ return int(d->length % 1000000);
}
int MPEG::Properties::bitrate() const
@@ -191,8 +196,9 @@
double timePerFrame = blockSize[firstHeader.layer()];
timePerFrame = firstHeader.sampleRate() > 0 ? timePerFrame / firstHeader.sampleRate() : 0;
- d->length = int(timePerFrame * xingHeader.totalFrames());
- d->bitrate = d->length > 0 ? xingHeader.totalSize() * 8 / d->length / 1000 : 0;
+ d->length = (long long)(
+ timePerFrame * xingHeader.totalFrames() * 1000000 + 0.5);
+ d->bitrate = d->length > 0 ? xingHeader.totalSize() * 8000 / d->length : 0;
}
// Since there was no valid Xing header found, we hope that we're in a constant
@@ -204,8 +210,10 @@
else if(firstHeader.frameLength() > 0 && firstHeader.bitrate() > 0) {
int frames = (last - first) / firstHeader.frameLength() + 1;
- d->length = int(float(firstHeader.frameLength() * frames) /
- float(firstHeader.bitrate() * 125) + 0.5);
+ d->length = (long long)(
+ (double(firstHeader.frameLength()) * frames * 1000000) /
+ (double(firstHeader.bitrate()) * 125) + 0.5);
+
d->bitrate = firstHeader.bitrate();
}
--- taglib-1.3.1/taglib/ogg/vorbis/vorbisproperties.h 2004-05-13 02:29:48.000000000 +0200
+++ taglib-1.3.1-microseconds/taglib/ogg/vorbis/vorbisproperties.h 2005-06-15 19:48:18.365492520 +0200
@@ -65,6 +65,7 @@
// Reimplementations.
virtual int length() const;
+ virtual int length_microseconds() const;
virtual int bitrate() const;
virtual int sampleRate() const;
virtual int channels() const;
--- taglib-1.3.1/taglib/ogg/vorbis/vorbisproperties.cpp 2003-12-02 06:00:23.000000000 +0100
+++ taglib-1.3.1-microseconds/taglib/ogg/vorbis/vorbisproperties.cpp 2005-06-15 20:36:41.687062239 +0200
@@ -46,7 +46,7 @@
File *file;
ReadStyle style;
- int length;
+ long long length;
int bitrate;
int sampleRate;
int channels;
@@ -81,7 +81,12 @@
int Vorbis::Properties::length() const
{
- return d->length;
+ return int(d->length / 1000000);
+}
+
+int Vorbis::Properties::length_microseconds() const
+{
+ return int(d->length % 1000000);
}
int Vorbis::Properties::bitrate() const
@@ -169,7 +174,7 @@
long long end = last->absoluteGranularPosition();
if(start >= 0 && end >= 0 && d->sampleRate > 0)
- d->length = (end - start) / (long long) d->sampleRate;
+ d->length = ((end - start) * 1000000) / (long long) d->sampleRate;
else
debug("Vorbis::Properties::read() -- Either the PCM values for the start or "
"end of this file was incorrect or the sample rate is zero.");

View file

@ -0,0 +1,112 @@
--- taglib/mpc/mpcproperties.cpp 2004/09/09 00:28:57 345141
+++ taglib/mpc/mpcproperties.cpp 2005/04/02 20:53:11 402712
@@ -106,7 +106,7 @@
void MPC::Properties::read()
{
- if(d->data.mid(0, 3) != "MP+")
+ if(!d->data.startsWith("MP+"))
return;
d->version = d->data[3] & 15;
@@ -116,7 +116,7 @@
if(d->version >= 7) {
frames = d->data.mid(4, 4).toUInt(false);
- std::bitset<32> flags = d->data.mid(8, 4).toUInt(true);
+ std::bitset<32> flags = d->data.mid(8, 4).toUInt(false);
d->sampleRate = sftable[flags[17] * 2 + flags[16]];
d->channels = 2;
}
--- taglib/mpc/mpcfile.cpp 2004/09/02 18:50:26 343576
+++ taglib/mpc/mpcfile.cpp 2005/04/03 16:41:17 402896
@@ -53,7 +53,10 @@
~FilePrivate()
{
+ if (tag != ID3v1Tag && tag != APETag) delete tag;
delete ID3v1Tag;
+ delete APETag;
+ delete ID3v2Header;
delete properties;
}
@@ -227,7 +230,7 @@
if(d->APETag)
d->tag = d->APETag;
else
- d->tag = d->APETag = new APE::Tag();
+ d->tag = d->APETag = new APE::Tag;
}
if(tags & ID3v2) {
@@ -242,7 +245,7 @@
if(d->ID3v1Tag)
d->tag = d->ID3v1Tag;
else
- d->tag = d->APETag = new APE::Tag();
+ d->tag = d->APETag = new APE::Tag;
}
}
@@ -284,7 +287,7 @@
if(d->hasAPE)
d->tag = d->APETag;
else
- d->tag = d->APETag = new APE::Tag();
+ d->tag = d->APETag = new APE::Tag;
}
}
--- taglib/ape/apeitem.h 2004/11/06 14:24:40 360969
+++ taglib/ape/apeitem.h 2005/04/03 16:35:55 402891
@@ -70,6 +70,11 @@
Item(const Item &item);
/*!
+ * Destroys the item.
+ */
+ virtual ~Item();
+
+ /*!
* Copies the contents of \a item into this item.
*/
Item &operator=(const Item &item);
--- taglib/ape/apeitem.cpp 2004/11/06 14:43:24 360973
+++ taglib/ape/apeitem.cpp 2005/04/03 16:35:55 402891
@@ -62,6 +62,11 @@
d = new ItemPrivate(*item.d);
}
+APE::Item::~Item()
+{
+ delete d;
+}
+
Item &APE::Item::operator=(const Item &item)
{
delete d;
@@ -111,7 +116,7 @@
String APE::Item::toString() const
{
- return d->text.front();
+ return isEmpty() ? String::null : d->text.front();
}
bool APE::Item::isEmpty() const
@@ -121,7 +126,7 @@
case 1:
if(d->text.isEmpty())
return true;
- if(d->text.size() == 1 && d->text.front() == "")
+ if(d->text.size() == 1 && d->text.front().isEmpty())
return true;
return false;
case 2:

View file

@ -0,0 +1,39 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit eutils flag-o-matic
DESCRIPTION="A library for reading and editing audio meta data"
HOMEPAGE="http://developer.kde.org/~wheeler/taglib.html"
SRC_URI="http://developer.kde.org/~wheeler/files/src/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips"
IUSE="debug"
DEPEND=">=sys-devel/autoconf-2.58"
RDEPEND=""
src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/${P}-memleak-fix2.patch
epatch ${FILESDIR}/${P}-length-in-microseconds.patch
rm -rf autom4te.cache
export WANT_AUTOCONF=2.5
export WANT_AUTOMAKE=1.7
aclocal && autoconf && automake || die "autotools failed"
}
src_compile() {
replace-flags -O3 -O2
econf `use_enable debug` || die
emake || die
}
src_install() {
make install DESTDIR=${D} destdir=${D} || die
}

View file

@ -0,0 +1,3 @@
MD5 5675251f4f6bd25fbf54f809816140ac gst-plugins-mad-0.8.10-r1.ebuild 421
MD5 e5a6b80e2dfc0bf36559f4663fb90e25 files/digest-gst-plugins-mad-0.8.10-r1 72
MD5 9b4b87c7c0e1bf243ebc6def2f62c971 files/id3demuxbin-pad-free-fix.patch 551

View file

@ -0,0 +1 @@
MD5 99f36ba2b91015a23d3c20a8f424b232 gst-plugins-0.8.10.tar.bz2 2397528

View file

@ -0,0 +1,15 @@
--- gst-plugins-0.8.9/ext/mad/gstid3demuxbin.c 2005-04-10 22:24:17.000000000 +0200
+++ gst-plugins-0.8.9-livesupport/ext/mad/gstid3demuxbin.c 2005-06-22 10:45:31.000000000 +0200
@@ -188,7 +188,11 @@
gst_id3demux_bin_remove_pad (GstId3DemuxBin * id3)
{
if (id3->srcpad) {
- gst_element_remove_pad (GST_ELEMENT (id3), id3->srcpad);
+ GstPad * pad = gst_element_get_pad(GST_ELEMENT(id3), "src");
+
+ if (pad && pad == id3->srcpad) {
+ gst_element_remove_pad (GST_ELEMENT (id3), id3->srcpad);
+ }
id3->srcpad = NULL;
}
}

View file

@ -0,0 +1,22 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit gst-plugins eutils
KEYWORDS="alpha amd64 ~arm hppa ia64 -mips ppc ppc64 sparc x86"
IUSE=""
RDEPEND=">=media-libs/libmad-0.15.1b
>=media-libs/libid3tag-0.15"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/id3demuxbin-pad-free-fix.patch
}

View file

@ -0,0 +1,8 @@
MD5 327ed3bdd51bf26a7fc4f8a097ec163f livesupport-1.0.ebuild 2745
MD5 88922583359d4f48bb62fe32edcf49bf files/storageServer-docroot.patch 496
MD5 748c25d0b1d9b77b549de03d2d054796 files/prefix-as-make-variable.patch 9729
MD5 c2d1ff785cf48e5379f9a3c408c44eb7 files/setup-install-dirs.patch 1430
MD5 f1b36bd5e8064413975e891f7e698909 files/taglib-curl-icu.patch 46021
MD5 a538c0d8cca6f56f49e849d02e7eeaf5 files/pg_hba.patch 1271
MD5 11fe70fcc870ab186dcc8ce354c43076 files/digest-livesupport-1.0 70
MD5 aa45773c2de23cc856a1bc11153637ec files/postinstall-config-file.patch 7791

View file

@ -0,0 +1 @@
MD5 73d76a5c9cd0c0b9e2f527e8a169183b livesupport-1.0.tar.bz2 10666438

View file

@ -0,0 +1,24 @@
--- livesupport-1.0/etc/pg_hba.conf 2005-08-13 12:33:33.000000000 +0200
+++ livesupport-1.0-gentoo/etc/pg_hba.conf 2005-09-22 13:48:24.000000000 +0200
@@ -85,18 +85,16 @@
# Database administrative login by UNIX sockets
local all postgres ident sameuser
#
-# All other connections by UNIX sockets
-local all all ident sameuser
-#
# All IPv4 connections from localhost
# The following line was inserted by the livesupport-station package installer
# the original pg_hba.conf file is saved under pg_hba.conf.before-livesupport
host all all 127.0.0.1 255.255.255.255 password
#host all all 127.0.0.1 255.255.255.255 ident sameuser
#
+# All other connections by UNIX sockets
+local all all password
+#
# All IPv6 localhost connections
-host all all ::1 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff ident sameuser
-host all all ::ffff:127.0.0.1/128 ident sameuser
#
# reject all other connection attempts
host all all 0.0.0.0 0.0.0.0 reject

View file

@ -0,0 +1,193 @@
--- livesupport-1.0/bin/postInstallStation.sh 2005-08-14 14:15:30.000000000 +0200
+++ livesupport-1.0-gentoo/bin/postInstallStation.sh 2005-09-22 13:16:23.000000000 +0200
@@ -155,9 +155,13 @@
echo " apache document root: $www_root";
echo ""
+
#-------------------------------------------------------------------------------
# The details of installation
#-------------------------------------------------------------------------------
+ls_hostname=localhost
+ls_www_port=80
+
ls_dbserver=$dbserver
ls_dbuser=$dbuser
ls_dbpassword=$dbpassword
@@ -168,9 +172,15 @@
install_bin=$installdir/bin
install_etc=$installdir/etc
install_lib=$installdir/lib
+install_tmp=$installdir/tmp
install_usr=$installdir/usr
install_var_ls=$installdir/var/LiveSupport
+php_url_prefix=livesupport
+alib_xml_rpc_prefix=xmlrpc/xrLocStor.php
+audio_out=plughw:0
+scheduler_port=3344
+
#-------------------------------------------------------------------------------
# Function to check for the existence of an executable on the PATH
@@ -226,19 +236,68 @@
#-------------------------------------------------------------------------------
+# Create the replacement string for the config files
+#-------------------------------------------------------------------------------
+install_lib_s=`echo ${install_lib} | sed -e "s/\//\\\\\\\\\//g"`
+install_tmp_s=`echo ${install_tmp} | sed -e "s/\//\\\\\\\\\//g"`
+php_url_prefix_s=`echo ${php_url_prefix} | sed -e "s/\//\\\\\\\\\//g"`
+alib_xml_rpc_prefix_s=`echo ${alib_xml_rpc_prefix} | sed -e "s/\//\\\\\\\\\//g"`
+audio_out_s=`echo ${audio_out} | sed -e "s/\//\\\\\\\\\//g"`
+
+
+replace_sed_string="s/ls_lib_dir/${install_lib_s}/; \
+ s/ls_dbuser/${ls_dbuser}/; \
+ s/ls_dbpassword/${ls_dbpassword}/; \
+ s/ls_dbserver/${ls_dbserver}/; \
+ s/ls_database/${ls_database}/; \
+ s/ls_php_urlPrefix/${php_url_prefix_s}/; \
+ s/ls_php_host/${ls_hostname}/; \
+ s/ls_php_port/${ls_www_port}/; \
+ s/ls_alib_xmlRpcPrefix/${alib_xml_rpc_prefix_s}/; \
+ s/ls_tmp_dir/${install_tmp_s}/; \
+ s/ls_audio_output_device/${audio_out_s}/; \
+ s/ls_scheduler_host/${ls_hostname}/; \
+ s/ls_scheduler_port/${scheduler_port}/;"
+
+
+#-------------------------------------------------------------------------------
+# Creating configuration files
+#-------------------------------------------------------------------------------
+echo "Creating configuration files...";
+
+cat $install_etc/scheduler.xml.template | sed -e "${replace_sed_string}" \
+ > $install_etc/scheduler.xml
+
+cat $install_var_ls/archiveServer/var/conf.php.template \
+ | sed -e "${replace_sed_string}" \
+ > $install_var_ls/archiveServer/var/conf.php
+
+cat $install_var_ls/storageServer/var/conf.php.template \
+ | sed -e "${replace_sed_string}" \
+ > $install_var_ls/storageServer/var/conf.php
+
+
+#-------------------------------------------------------------------------------
# Install the new pg_hba.conf file
#-------------------------------------------------------------------------------
echo "Modifying postgresql access permissions...";
-pg_config_dir=/etc/postgresql
pg_config_file=pg_hba.conf
pg_config_file_saved=pg_hba.conf.before-livesupport
+pg_config_dir=/etc/postgresql
if [ -f $pg_config_dir/$pg_config_file ] ; then
mv -f $pg_config_dir/$pg_config_file $pg_config_dir/$pg_config_file_saved ;
+ cp $install_etc/$pg_config_file $pg_config_dir/$pg_config_file
+ chown root:$postgres_user $pg_config_dir/$pg_config_file
+fi
+
+pg_config_dir=/var/lib/postgresql/data/
+if [ -f $pg_config_dir/$pg_config_file ] ; then
+ mv -f $pg_config_dir/$pg_config_file $pg_config_dir/$pg_config_file_saved ;
+ cp $install_etc/$pg_config_file $pg_config_dir/$pg_config_file
+ chown root:$postgres_user $pg_config_dir/$pg_config_file
fi
-cp $install_etc/$pg_config_file $pg_config_dir/$pg_config_file
-chown root:$postgres_user $pg_config_dir/$pg_config_file
/etc/init.d/postgresql restart
@@ -290,6 +349,10 @@
odbc_template=$install_etc/odbc_template
odbc_template_tmp=/tmp/odbc_template.$$
+# customied odbc template file
+cat $install_etc/odbc_template | sed -e "${replace_sed_string}" \
+ > $odbc_template_tmp
+
# check for an existing PostgreSQL ODBC driver, and only install if necessary
odbcinst_res=`odbcinst -q -d | grep "\[PostgreSQL\]"`
if [ "x$odbcinst_res" == "x" ]; then
@@ -298,13 +361,17 @@
fi
echo "Registering LiveSupport ODBC data source...";
-odbcinst -i -s -l -f $odbc_template || exit 1;
+odbcinst -i -s -l -f $odbc_template_tmp || exit 1;
+
+rm -f $odbc_template_tmp
#-------------------------------------------------------------------------------
# Install PEAR packages (locally in the LiveSupport)
#-------------------------------------------------------------------------------
-$install_usr/lib/pear/bin/install.sh -d $installdir || exit 1;
+if [ -f $install_usr/lib/pear/bin/install.sh ]; then
+ $install_usr/lib/pear/bin/install.sh -d $installdir || exit 1;
+fi
#-------------------------------------------------------------------------------
@@ -338,6 +405,7 @@
chmod g+sw $install_var_ls/htmlUI/var/templates_c
chmod g+sw $install_var_ls/htmlUI/var/html/img
+
#-------------------------------------------------------------------------------
# Configuring Apache
#-------------------------------------------------------------------------------
@@ -421,7 +489,9 @@
export LD_LIBRARY_PATH=$install_lib
export GST_REGISTRY=$install_etc/gst-registry.xml
export GST_PLUGIN_PATH=$gstreamer_dir
-$install_bin/gst-register > /dev/null 2>&1
+if [ -f $install_bin/gst-register ]; then
+ $install_bin/gst-register > /dev/null 2>&1
+fi
#-------------------------------------------------------------------------------
--- livesupport-1.0/products/scheduler/etc/Makefile.in 2005-09-21 15:33:18.000000000 +0200
+++ livesupport-1.0-gentoo/products/scheduler/etc/Makefile.in 2005-09-22 12:47:38.000000000 +0200
@@ -375,10 +375,8 @@
${CP} ${SCHEDULER_EXE} ${USR_BIN_DIR}
${CP} ${ETC_DIR}/odbcinst_debian_template \
${ETC_DIR}/odbcinst_template ${USR_ETC_DIR}
- ${CAT} ${ETC_DIR}/odbc_template | ${SED} -e ${REPLACE_SED_STRING} \
- > ${USR_ETC_DIR}/odbc_template
- ${CAT} ${ETC_DIR}/scheduler.xml.template | ${SED} -e ${REPLACE_SED_STRING} \
- > ${USR_ETC_DIR}/scheduler.xml
+ ${CP} ${ETC_DIR}/odbc_template ${USR_ETC_DIR}
+ ${CP} ${ETC_DIR}/scheduler.xml.template ${USR_ETC_DIR}
create_database:
ifeq (@CREATE_LS_DATABASE@,yes)
--- livesupport-1.0/modules/archiveServer/etc/Makefile.in 2005-09-21 15:33:18.000000000 +0200
+++ livesupport-1.0-gentoo/modules/archiveServer/etc/Makefile.in 2005-09-22 13:14:20.000000000 +0200
@@ -165,8 +165,7 @@
${CP} ${VAR_DIR}/*.{php,template} ${DEST_DIR}
${CP} ${VAR_DIR}/install/*.php ${DEST_DIR}/install
${CP} ${VAR_DIR}/xmlrpc/*.php ${DEST_DIR}/xmlrpc
- ${CAT} ${VAR_DIR}/conf.php.template | ${SED} -e ${REPLACE_SED_STRING} \
- > ${DEST_DIR}/conf.php
+ ${CP} ${VAR_DIR}/conf.php.template ${DEST_DIR}
#-------------------------------------------------------------------------------
--- livesupport-1.0/modules/storageServer/etc/Makefile.in 2005-09-21 15:33:18.000000000 +0200
+++ livesupport-1.0-gentoo/modules/storageServer/etc/Makefile.in 2005-09-22 13:14:20.000000000 +0200
@@ -183,8 +183,7 @@
${DEST_DIR}/install
${CP} ${VAR_DIR}/xmlrpc/*.php \
${DEST_DIR}/xmlrpc
- ${CAT} ${VAR_DIR}/conf.php.template | ${SED} -e ${REPLACE_SED_STRING} \
- > ${DEST_DIR}/conf.php
+ ${CP} ${VAR_DIR}/conf.php.template ${DEST_DIR}
chgrp ${APACHE_GROUP} ${DEST_DIR}/access
chgrp ${APACHE_GROUP} ${DEST_DIR}/stor

View file

@ -0,0 +1,238 @@
diff -Naur livesupport-1.0/modules/alib/etc/Makefile.in livesupport-1.0-gentoo/modules/alib/etc/Makefile.in
--- livesupport-1.0/modules/alib/etc/Makefile.in 2005-08-01 21:25:59.000000000 +0200
+++ livesupport-1.0-gentoo/modules/alib/etc/Makefile.in 2005-09-21 11:55:23.000000000 +0200
@@ -59,7 +59,9 @@
TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_VAR_DIR = ${USR_DIR}/var
diff -Naur livesupport-1.0/modules/archiveServer/etc/Makefile.in livesupport-1.0-gentoo/modules/archiveServer/etc/Makefile.in
--- livesupport-1.0/modules/archiveServer/etc/Makefile.in 2005-08-01 21:25:59.000000000 +0200
+++ livesupport-1.0-gentoo/modules/archiveServer/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -62,7 +62,9 @@
TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib
USR_VAR_DIR = ${USR_DIR}/var
diff -Naur livesupport-1.0/modules/authentication/etc/Makefile.in livesupport-1.0-gentoo/modules/authentication/etc/Makefile.in
--- livesupport-1.0/modules/authentication/etc/Makefile.in 2005-08-01 21:25:59.000000000 +0200
+++ livesupport-1.0-gentoo/modules/authentication/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -50,7 +50,9 @@
SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31
diff -Naur livesupport-1.0/modules/core/etc/Makefile.in livesupport-1.0-gentoo/modules/core/etc/Makefile.in
--- livesupport-1.0/modules/core/etc/Makefile.in 2005-09-21 11:57:28.000000000 +0200
+++ livesupport-1.0-gentoo/modules/core/etc/Makefile.in 2005-09-21 11:55:38.000000000 +0200
@@ -53,7 +53,9 @@
TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_BIN_DIR = ${USR_DIR}/bin
USR_LIB_DIR = ${USR_DIR}/lib
diff -Naur livesupport-1.0/modules/db/etc/Makefile.in livesupport-1.0-gentoo/modules/db/etc/Makefile.in
--- livesupport-1.0/modules/db/etc/Makefile.in 2005-08-01 21:25:59.000000000 +0200
+++ livesupport-1.0-gentoo/modules/db/etc/Makefile.in 2005-09-21 11:55:10.000000000 +0200
@@ -51,7 +51,9 @@
SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31
diff -Naur livesupport-1.0/modules/eventScheduler/etc/Makefile.in livesupport-1.0-gentoo/modules/eventScheduler/etc/Makefile.in
--- livesupport-1.0/modules/eventScheduler/etc/Makefile.in 2005-08-08 13:57:53.000000000 +0200
+++ livesupport-1.0-gentoo/modules/eventScheduler/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -50,7 +50,9 @@
SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31
diff -Naur livesupport-1.0/modules/getid3/etc/Makefile.in livesupport-1.0-gentoo/modules/getid3/etc/Makefile.in
--- livesupport-1.0/modules/getid3/etc/Makefile.in 2005-08-01 21:25:59.000000000 +0200
+++ livesupport-1.0-gentoo/modules/getid3/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -60,7 +60,9 @@
TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_VAR_DIR = ${USR_DIR}/var
diff -Naur livesupport-1.0/modules/gstreamerElements/etc/Makefile.in livesupport-1.0-gentoo/modules/gstreamerElements/etc/Makefile.in
--- livesupport-1.0/modules/gstreamerElements/etc/Makefile.in 2005-09-21 11:57:28.000000000 +0200
+++ livesupport-1.0-gentoo/modules/gstreamerElements/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -56,7 +56,9 @@
REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd)
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_BIN_DIR = ${USR_DIR}/bin
USR_LIB_DIR = ${USR_DIR}/lib
diff -Naur livesupport-1.0/modules/htmlUI/etc/Makefile.in livesupport-1.0-gentoo/modules/htmlUI/etc/Makefile.in
--- livesupport-1.0/modules/htmlUI/etc/Makefile.in 2005-08-10 00:03:11.000000000 +0200
+++ livesupport-1.0-gentoo/modules/htmlUI/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -61,7 +61,9 @@
TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_VAR_DIR = ${USR_DIR}/var
diff -Naur livesupport-1.0/modules/playlistExecutor/etc/Makefile.in livesupport-1.0-gentoo/modules/playlistExecutor/etc/Makefile.in
--- livesupport-1.0/modules/playlistExecutor/etc/Makefile.in 2005-09-21 11:57:28.000000000 +0200
+++ livesupport-1.0-gentoo/modules/playlistExecutor/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -53,7 +53,9 @@
REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd)
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31
diff -Naur livesupport-1.0/modules/schedulerClient/etc/Makefile.in livesupport-1.0-gentoo/modules/schedulerClient/etc/Makefile.in
--- livesupport-1.0/modules/schedulerClient/etc/Makefile.in 2005-09-21 11:57:29.000000000 +0200
+++ livesupport-1.0-gentoo/modules/schedulerClient/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -50,7 +50,9 @@
SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31
diff -Naur livesupport-1.0/modules/storage/etc/Makefile.in livesupport-1.0-gentoo/modules/storage/etc/Makefile.in
--- livesupport-1.0/modules/storage/etc/Makefile.in 2005-09-21 11:57:29.000000000 +0200
+++ livesupport-1.0-gentoo/modules/storage/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -50,7 +50,9 @@
SRC_DIR = ${BASE_DIR}/src
TMP_DIR = ${BASE_DIR}/tmp
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib
BOOST_INCLUDE_DIR = ${USR_INCLUDE_DIR}/boost-1_31
diff -Naur livesupport-1.0/modules/storageAdmin/etc/Makefile.in livesupport-1.0-gentoo/modules/storageAdmin/etc/Makefile.in
--- livesupport-1.0/modules/storageAdmin/etc/Makefile.in 2005-08-11 02:41:22.000000000 +0200
+++ livesupport-1.0-gentoo/modules/storageAdmin/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -64,7 +64,9 @@
VAR_DIR = ${BASE_DIR}/var
BIN_DIR = ${BASE_DIR}/bin
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_VAR_DIR = ${USR_DIR}/var
diff -Naur livesupport-1.0/modules/storageServer/etc/Makefile.in livesupport-1.0-gentoo/modules/storageServer/etc/Makefile.in
--- livesupport-1.0/modules/storageServer/etc/Makefile.in 2005-08-16 14:45:00.000000000 +0200
+++ livesupport-1.0-gentoo/modules/storageServer/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -64,7 +64,9 @@
TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_LIB_DIR = ${USR_DIR}/lib
USR_VAR_DIR = ${USR_DIR}/var
diff -Naur livesupport-1.0/modules/widgets/etc/Makefile.in livesupport-1.0-gentoo/modules/widgets/etc/Makefile.in
--- livesupport-1.0/modules/widgets/etc/Makefile.in 2005-08-08 13:57:53.000000000 +0200
+++ livesupport-1.0-gentoo/modules/widgets/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -53,7 +53,9 @@
TMP_DIR = ${BASE_DIR}/tmp
VAR_DIR = ${BASE_DIR}/var
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_INCLUDE_DIR = ${USR_DIR}/include
USR_BIN_DIR = ${USR_DIR}/bin
USR_LIB_DIR = ${USR_DIR}/lib
diff -Naur livesupport-1.0/products/gLiveSupport/etc/Makefile.in livesupport-1.0-gentoo/products/gLiveSupport/etc/Makefile.in
--- livesupport-1.0/products/gLiveSupport/etc/Makefile.in 2005-09-21 11:57:29.000000000 +0200
+++ livesupport-1.0-gentoo/products/gLiveSupport/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -58,7 +58,9 @@
REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd)
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_BIN_DIR = ${USR_DIR}/bin
USR_ETC_DIR = ${USR_DIR}/etc
USR_INCLUDE_DIR = ${USR_DIR}/include
diff -Naur livesupport-1.0/products/scheduler/etc/Makefile.in livesupport-1.0-gentoo/products/scheduler/etc/Makefile.in
--- livesupport-1.0/products/scheduler/etc/Makefile.in 2005-09-21 11:57:29.000000000 +0200
+++ livesupport-1.0-gentoo/products/scheduler/etc/Makefile.in 2005-09-21 11:56:57.000000000 +0200
@@ -56,7 +56,9 @@
REAL_BASE_DIR=$(shell cd ${BASE_DIR}; pwd)
-USR_DIR = @prefix@
+prefix = @prefix@
+
+USR_DIR = ${prefix}
USR_BIN_DIR = ${USR_DIR}/bin
USR_ETC_DIR = ${USR_DIR}/etc
USR_INCLUDE_DIR = ${USR_DIR}/include

View file

@ -0,0 +1,40 @@
--- livesupport-1.0/etc/Makefile.in 2005-08-25 13:09:41.000000000 +0200
+++ livesupport-1.0-gentoo/etc/Makefile.in 2005-09-21 13:26:08.000000000 +0200
@@ -54,7 +54,10 @@
USR_DIR = ${prefix}
USR_BIN_DIR = ${USR_DIR}/bin
+USR_DOC_DIR = ${USR_DIR}/doc
USR_ETC_DIR = ${USR_DIR}/etc
+USR_LIB_DIR = ${USR_DIR}/lib
+USR_VAR_DIR = ${USR_DIR}/var
HOSTNAME = @HOSTNAME@
APACHE_GROUP = @APACHE_GROUP@
@@ -426,9 +430,10 @@
#-------------------------------------------------------------------------------
# Installation related targets
#-------------------------------------------------------------------------------
-.PHONY: install create_database install_modules install_products
+.PHONY: install create_database setup_install_dirs
+.PHONY: install_modules install_products
-install: setup compile create_database install_modules install_products
+install: setup compile setup_install_dirs create_database install_modules install_products
${MKDIR} ${USR_ETC_DIR}/apache
${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache
${MKDIR} ${USR_BIN_DIR}
@@ -444,6 +449,13 @@
--dbpassword=${DB_PASSWORD}
endif
+setup_install_dirs:
+ ${MKDIR} ${USR_BIN_DIR}
+ ${MKDIR} ${USR_DOC_DIR}
+ ${MKDIR} ${USR_ETC_DIR}
+ ${MKDIR} ${USR_LIB_DIR}
+ ${MKDIR} ${USR_VAR_DIR}
+
install_modules:
${MAKE} -C ${ALIB_DIR} install
${MAKE} -C ${ARCHIVE_SERVER_DIR} install

View file

@ -0,0 +1,10 @@
--- livesupport-1.0/etc/Makefile.in 2005-08-25 13:09:41.000000000 +0200
+++ livesupport-1.0-gentoo/etc/Makefile.in 2005-09-21 13:08:47.000000000 +0200
@@ -314,6 +314,7 @@
./configure --prefix=${prefix} \
--with-apache-group=${APACHE_GROUP} \
--with-hostname=${HOSTNAME} \
+ --with-www-docroot=${WWW_DOCROOT} \
--with-www-port=${WWW_PORT} \
--with-scheduler-port=${SCHEDULER_PORT} \
--with-database-server=${DB_SERVER} \

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,105 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header$
inherit eutils flag-o-matic
IUSE=""
DESCRIPTION="LiveSupport is a radio broadcast support tool."
HOMEPAGE="http://livesupport.campware.org/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
RESTRICT="maketest"
DEPEND=">=dev-db/unixODBC-2.2
media-libs/fontconfig
>=media-libs/libpng-1.2
media-libs/jpeg
dev-libs/openssl
dev-libs/libxml2
dev-libs/popt
media-libs/alsa-lib
media-libs/libid3tag
media-libs/libmad
media-libs/libogg
media-libs/libvorbis
>=dev-libs/boost-0.31
sys-apps/sed
net-www/apache
dev-lang/php
>=dev-php/PEAR-PEAR-1.3.5
>=dev-php/PEAR-Archive_Tar-1.3.1
>=dev-php/PEAR-Calendar-0.5.2
>=dev-php/PEAR-Console_Getopt-1.2
>=dev-php/PEAR-DB-1.7.6
>=dev-php/PEAR-File-1.2.0
>=dev-php/PEAR-File_Find-0.3.1
>=dev-php/PEAR-HTML_Common-1.2.1-r1
>=dev-php/PEAR-HTML_QuickForm-3.2.4
>=dev-php/PEAR-XML_Beautifier-1.1
>=dev-php/PEAR-XML_Parser-1.2.6
>=dev-php/PEAR-XML_RPC-1.4.0
>=dev-php/PEAR-XML_Serializer-0.15
>=dev-php/PEAR-XML_Util-1.1.1
>=dev-db/postgresql-7.4
>=x11-libs/gtk+-2.6.1
>=dev-cpp/gtkmm-2.5.5
>=net-misc/curl-7.13.2
>=dev-cpp/libxmlpp-2.8.1
=dev-db/libodbc++-0.2.3-r2
=dev-libs/xmlrpc++-0.7
=media-libs/gst-plugins-0.8.10-r1
=media-libs/taglib-1.3.1-r3
=media-plugins/gst-plugins-mad-0.8.10-r1
=media-plugins/gst-plugins-ogg-0.8.10
=media-libs/gstreamer-0.8.10"
src_unpack() {
unpack ${A}
cd ${S}
# these patches are committed to the source as of 2005-09-23
epatch ${FILESDIR}/taglib-curl-icu.patch
epatch ${FILESDIR}/prefix-as-make-variable.patch
epatch ${FILESDIR}/storageServer-docroot.patch
epatch ${FILESDIR}/setup-install-dirs.patch
epatch ${FILESDIR}/pg_hba.patch
# this patch not committed
epatch ${FILESDIR}/postinstall-config-file.patch
# toch the tools make stamp, so that tools don't get built
touch tmp/tools_setup.stamp
}
src_compile() {
# append -g, otherwise we get 'defined in discared section' linkage errors
append-flags -g
econf --with-create-database=no \
--with-create-odbc-data-source=no \
--with-init-database=no \
--with-configure-apache=no \
--with-apache-group=apache \
--with-www-docroot=${D}/var/www/localhost/htdocs \
|| die "configure failed"
emake -j1 || die "make failed"
}
src_install() {
# to make sure the link from the docroot works
mkdir -p ${D}/var/www/localhost/htdocs
emake -j1 prefix=${D}/usr install || die "install failed"
dodoc doc INSTALL README
}
pkg_postinst() {
/usr/bin/postInstallStation.sh --directory /usr \
--www-root /var/www/localhost/htdocs \
--apache-group apache
}