xine-lib und ffmpeg hinzugefügt

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5014 504e572c-2e33-0410-9681-be2bf7408885

SysBuild/BuildCluster/XBaseLibs.dmk

@@ -45,3 +45,5 @@
 0	guibased/libxmi
 0	security/libtasn1
 0	multimedia/libcanberra
+0	multimedia/ffmpeg
+0	multimedia/xine-lib

SysBuild/multimedia/ffmpeg

@@ -71,33 +71,36 @@
 #
 
 #Pfad zu Basis Source Tree eintragen!
-SRCPATH=X11/MultiMedia
+SRCPATH=MultiMedia/Lib
 
 #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
 #ausgeführt (sprich unpack src; cd src; premk)
 #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
 
 premk() {
-	X11R7_Fix
+	echo "Nothing to do for premk()"
 }
 
 mk32() {
 	CC="gcc $BUILDOPTIONS32" \
 	CXX="g++ $BUILDOPTIONS32" \
-	CFLAGS="$BUILDOPTIONS32" \
+	CFLAGS="$BUILDOPTIONS32 -fno-PIC" \
-	LDFLAGS="-m32 -L/lib -L/usr/lib -L/usr/X11R7/lib" \
+	USE_ARCH=32 \
+	LDEMULATION="elf32_i386" \
+	LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
 	./configure --arch=i386 \
-		    --prefix=/usr/X11R7 \
+		    --prefix=/usr \
-	            --enable-liba52 \
+		    --cc="gcc ${BUILDOPTIONS32}" \
-		    --enable-libmp3lame \
-		    --enable-libogg \
-		    --enable-libvorbis \
-		    --enable-gpl \
 		    --enable-shared \
-		    --enable-pthreads
+		    --enable-pthreads \
+		    --enable-gpl \
+		    --enable-postproc \
+		    --enable-x11grab \
+		    --enable-nonfree
 	make -j $NUMCPU
 	make -j $NUMCPU PREFIX=/usr/X11R7 DESTDIR=$TMPROOT install
 	make distclean
+	mv $TMPROOT/usr/lib $TMPROOT/usr/lib32
 }
 
 mk() {
@@ -108,17 +111,21 @@ mk() {
 	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
-	CFLAGS="$BUILDOPTIONS" \
+	CFLAGS="$BUILDOPTIONS -fno-PIC" \
+	USE_ARCH=$UARCH \
 	./configure --arch=$ARCH \
-		    --prefix=/usr/X11R7 \
+		    --prefix=/usr \
-	            --enable-liba52 \
+		    --libdir=/usr/$LIBDIR \
-		    --enable-libmp3lame \
+		    --cc="gcc ${BUILDOPTIONS}" \
-		    --enable-libogg \
-		    --enable-libvorbis \
-		    --enable-gpl \
 		    --enable-shared \
-		    --enable-pthreads
+		    --enable-pthreads \
-	make -j $NUMCPU
+		    --enable-gpl \
+		    --enable-postproc \
+		    --enable-x11grab \
+		    --enable-nonfree 
+	make -j $NUMCPU libdir=\${DESTDIR}\${PREFIX}/$LIBDIR \
+	                shlibdir=\${DESTDIR}\${PREFIX}/$LIBDIR \
+			PREFIX=/usr/X11R7 
 	make -j $NUMCPU libdir=\${DESTDIR}\${PREFIX}/$LIBDIR \
 	                shlibdir=\${DESTDIR}\${PREFIX}/$LIBDIR \
 			PREFIX=/usr/X11R7 \
@@ -132,4 +139,9 @@ postmk() {
 	cd $TMPROOT/usr/include
 	ln -s ../X11R7/include/ffmpeg .
 	cd -
+	if [ "$MK64BIT" == "true" ]; then
+		mv $TMPROOT/usr/lib/* $TMPROOT/usr/lib64/
+		rm -r $TMPROOT/usr/lib
+		mv $TMPROOT/usr/lib32 $TMPROOT/usr/lib
+	fi
 }

SysBuild/multimedia/xine-lib

@@ -69,7 +69,7 @@
 #
 
 #Pfad zum Basis-Sourcetree :
-SRCPATH=X11/MultiMedia
+SRCPATH=MultiMedia/Lib
 
 #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist
 #SRCDIR=<PFAD>
@@ -82,13 +82,19 @@ premk() {
 mk32() {
 	CC="gcc $BUILDOPTIONS32" \
 	CXX="g++ $BUILDOPTIONS32" \
+	USE_ARCH=32 \
 	LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
 	./configure --target=$TARGET32 \
+	            --build=$TARGET32 \
+		    --host=$TARGET32 \
 		    --prefix=/usr/X11R7 \
-		    --with-gnu-ld
+		    --without-imagemagick \
+		    --with-gnu-ld \
+		    --enable-modplug \
+		    --with-external-ffmpeg \
+		    --with-w32-path=/usr/lib/win32
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	ClearHostSysNameing32 $TMPROOT
 	make distclean
 }
 
@@ -98,14 +104,18 @@ mk() {
 	fi
 	CC="gcc $BUILDOPTIONS" \
 	CXX="g++ $BUILDOPTIONS" \
-	./configure --target=$TARGET \
+	USE_ARCH=$UARCH \
-		    --prefix=/usr/X11R7 \
+	./configure --prefix=/usr/X11R7 \
 		    $ADDOPTIONS \
-		    --with-gnu-ld
+		    --without-imagemagick \
+		    --with-gnu-ld \
+		    --enable-modplug \
+		    --with-external-ffmpeg \
+		    --with-w32-path=/usr/lib/win32
 	make -j $NUMCPU 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
-	ClearHostSysNameing $TMPROOT
+	echo "Nothing to do for postmk()"
 }