live 2012.04.26-1 màj port

5 files changed, 21 insertions, 37 deletions

diff --git a/live/.footprint.i686 b/live/.footprint.i686
index 4f2bc5736..f497e288f 100644
--- a/live/.footprint.i686
+++ b/live/.footprint.i686
@@ -110,7 +110,6 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/MP3ADUinterleaving.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3AudioFileServerMediaSubsession.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3FileSource.hh
--r--r--r--	root/root	usr/include/liveMedia/MP3HTTPSource.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3Transcoder.hh
 -r--r--r--	root/root	usr/include/liveMedia/MPEG1or2AudioRTPSink.hh
 -r--r--r--	root/root	usr/include/liveMedia/MPEG1or2AudioRTPSource.hh
@@ -154,6 +153,7 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/OnDemandServerMediaSubsession.hh
 -r--r--r--	root/root	usr/include/liveMedia/OutputFile.hh
 -r--r--r--	root/root	usr/include/liveMedia/PassiveServerMediaSubsession.hh
+-r--r--r--	root/root	usr/include/liveMedia/ProxyServerMediaSession.hh
 -r--r--r--	root/root	usr/include/liveMedia/QCELPAudioRTPSource.hh
 -r--r--r--	root/root	usr/include/liveMedia/QuickTimeFileSink.hh
 -r--r--r--	root/root	usr/include/liveMedia/QuickTimeGenericRTPSource.hh
@@ -185,16 +185,9 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/liveMedia_version.hh
 -r--r--r--	root/root	usr/include/liveMedia/uLawAudioFilter.hh
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libliveMedia.so -> libliveMedia.so.2012.02.29
-lrwxrwxrwx	root/root	usr/lib/libliveMedia.so.2012.02.29 -> live/libliveMedia.so.2012.02.29
-drwxr-xr-x	root/root	usr/lib/live/
-drwxr-xr-x	root/root	usr/lib/live/BasicUsageEnvironment/
--rw-r--r--	root/root	usr/lib/live/BasicUsageEnvironment/libBasicUsageEnvironment.a
-drwxr-xr-x	root/root	usr/lib/live/UsageEnvironment/
--rw-r--r--	root/root	usr/lib/live/UsageEnvironment/libUsageEnvironment.a
-drwxr-xr-x	root/root	usr/lib/live/groupsock/
--rw-r--r--	root/root	usr/lib/live/groupsock/libgroupsock.a
-lrwxrwxrwx	root/root	usr/lib/live/libliveMedia.so -> libliveMedia.so.2012.02.29
--rwxr-xr-x	root/root	usr/lib/live/libliveMedia.so.2012.02.29
-drwxr-xr-x	root/root	usr/lib/live/liveMedia/
--rw-r--r--	root/root	usr/lib/live/liveMedia/libliveMedia.a
+-rw-r--r--	root/root	usr/lib/libBasicUsageEnvironment.a
+-rw-r--r--	root/root	usr/lib/libUsageEnvironment.a
+-rw-r--r--	root/root	usr/lib/libgroupsock.a
+-rw-r--r--	root/root	usr/lib/libliveMedia.a
+lrwxrwxrwx	root/root	usr/lib/libliveMedia.so -> libliveMedia.so.2012.04.26
+-rwxr-xr-x	root/root	usr/lib/libliveMedia.so.2012.04.26
diff --git a/live/.footprint.x86_64 b/live/.footprint.x86_64
index 4f2bc5736..f497e288f 100644
--- a/live/.footprint.x86_64
+++ b/live/.footprint.x86_64
@@ -110,7 +110,6 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/MP3ADUinterleaving.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3AudioFileServerMediaSubsession.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3FileSource.hh
--r--r--r--	root/root	usr/include/liveMedia/MP3HTTPSource.hh
 -r--r--r--	root/root	usr/include/liveMedia/MP3Transcoder.hh
 -r--r--r--	root/root	usr/include/liveMedia/MPEG1or2AudioRTPSink.hh
 -r--r--r--	root/root	usr/include/liveMedia/MPEG1or2AudioRTPSource.hh
@@ -154,6 +153,7 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/OnDemandServerMediaSubsession.hh
 -r--r--r--	root/root	usr/include/liveMedia/OutputFile.hh
 -r--r--r--	root/root	usr/include/liveMedia/PassiveServerMediaSubsession.hh
+-r--r--r--	root/root	usr/include/liveMedia/ProxyServerMediaSession.hh
 -r--r--r--	root/root	usr/include/liveMedia/QCELPAudioRTPSource.hh
 -r--r--r--	root/root	usr/include/liveMedia/QuickTimeFileSink.hh
 -r--r--r--	root/root	usr/include/liveMedia/QuickTimeGenericRTPSource.hh
@@ -185,16 +185,9 @@ drwxr-xr-x	root/root	usr/include/liveMedia/
 -r--r--r--	root/root	usr/include/liveMedia/liveMedia_version.hh
 -r--r--r--	root/root	usr/include/liveMedia/uLawAudioFilter.hh
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libliveMedia.so -> libliveMedia.so.2012.02.29
-lrwxrwxrwx	root/root	usr/lib/libliveMedia.so.2012.02.29 -> live/libliveMedia.so.2012.02.29
-drwxr-xr-x	root/root	usr/lib/live/
-drwxr-xr-x	root/root	usr/lib/live/BasicUsageEnvironment/
--rw-r--r--	root/root	usr/lib/live/BasicUsageEnvironment/libBasicUsageEnvironment.a
-drwxr-xr-x	root/root	usr/lib/live/UsageEnvironment/
--rw-r--r--	root/root	usr/lib/live/UsageEnvironment/libUsageEnvironment.a
-drwxr-xr-x	root/root	usr/lib/live/groupsock/
--rw-r--r--	root/root	usr/lib/live/groupsock/libgroupsock.a
-lrwxrwxrwx	root/root	usr/lib/live/libliveMedia.so -> libliveMedia.so.2012.02.29
--rwxr-xr-x	root/root	usr/lib/live/libliveMedia.so.2012.02.29
-drwxr-xr-x	root/root	usr/lib/live/liveMedia/
--rw-r--r--	root/root	usr/lib/live/liveMedia/libliveMedia.a
+-rw-r--r--	root/root	usr/lib/libBasicUsageEnvironment.a
+-rw-r--r--	root/root	usr/lib/libUsageEnvironment.a
+-rw-r--r--	root/root	usr/lib/libgroupsock.a
+-rw-r--r--	root/root	usr/lib/libliveMedia.a
+lrwxrwxrwx	root/root	usr/lib/libliveMedia.so -> libliveMedia.so.2012.04.26
+-rwxr-xr-x	root/root	usr/lib/libliveMedia.so.2012.04.26
diff --git a/live/.md5sum.i686 b/live/.md5sum.i686
index fc2de55c4..be918be5a 100644
--- a/live/.md5sum.i686
+++ b/live/.md5sum.i686
@@ -1 +1 @@
-ee00b4f9ca4efaa1aeaf47b5c185fe93  live.2012.02.29.tar.gz
+4c7202e0611951998325b0e41ae63041  live.2012.04.26.tar.gz
diff --git a/live/.md5sum.x86_64 b/live/.md5sum.x86_64
index fc2de55c4..be918be5a 100644
--- a/live/.md5sum.x86_64
+++ b/live/.md5sum.x86_64
@@ -1 +1 @@
-ee00b4f9ca4efaa1aeaf47b5c185fe93  live.2012.02.29.tar.gz
+4c7202e0611951998325b0e41ae63041  live.2012.04.26.tar.gz
diff --git a/live/Pkgfile b/live/Pkgfile
index 1d4e037bb..6339b8835 100644
--- a/live/Pkgfile
+++ b/live/Pkgfile
@@ -6,7 +6,7 @@
 # Run on:
 
 name=live
-version=2012.02.29
+version=2012.04.26
 release=1
 source=(http://www.live555.com/liveMedia/public/${name}.$version.tar.gz)
 
@@ -16,6 +16,7 @@ build() {
 	cd $name
 
 	sed \
+		-e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
 		-e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \
 		-e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \
 		-i config.linux -i config.linux-64bit
@@ -27,8 +28,8 @@ build() {
 	gcc -shared -o libliveMedia.so.$version */*.a
 
 	for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
-		mkdir -p $PKG/usr/{lib/live,include}/$dir
-		cp -r $dir/*.a $PKG/usr/lib/live/$dir
+		mkdir -p $PKG/usr/{lib,include/$dir}
+		cp -r $dir/*.a $PKG/usr/lib/
 		cp -r $dir/include/* $PKG/usr/include/$dir
 	done
 
@@ -38,9 +39,6 @@ build() {
 	done
 	install -m755 mediaServer/live555MediaServer $PKG/usr/bin
 
-	cp libliveMedia.so.$version $PKG/usr/lib/live/
-	ln -s libliveMedia.so.$version $PKG/usr/lib/live/libliveMedia.so
-	ln -s live/libliveMedia.so.$version $PKG/usr/lib/libliveMedia.so.$version
+	cp libliveMedia.so.$version $PKG/usr/lib
 	ln -s libliveMedia.so.$version $PKG/usr/lib/libliveMedia.so
-
 }