live 2011.07.18-2 correction port

1 files changed, 26 insertions, 10 deletions

diff --git a/base/live/Pkgfile b/base/live/Pkgfile
index 1cc19aca7..3df2a8251 100644
--- a/base/live/Pkgfile
+++ b/base/live/Pkgfile
@@ -7,22 +7,38 @@
 
 name=live
 version=2011.07.18
-release=1
+release=2
 source=(http://www.live555.com/liveMedia/public/${name}.$version.tar.gz)
 
 build() {
 	mkdir -p $PKG/usr/lib
 
 	cd $name
+	sed \
+		-e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -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
+
 	./genMakefiles linux
-	make COMPILE_OPTS="-I. -O -DSOCKLEN_T=socklen_t -I../liveMedia/include -I../groupsock/include -I../UsageEnvironment/include -I.././BasicUsageEnvironment/include"
-	cd ..
-    	cp -rf $name $PKG/usr/lib
-	rm -rf $PKG/usr/lib/$name/{README,COPYING,Makefile*,config*,gen*}
-	find $PKG -iname "*.cpp"      -type "f" | xargs rm -rf
-	find $PKG -iname "COPYING"    -type "f" | xargs rm -rf
-	find $PKG -iname "Makefile*"  -type "f" | xargs rm -rf
-
-	chown -R root:root $PKG
+	make
+
+	gcc -shared -o libliveMedia.so.$version */*.a
+
+	for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
+		mkdir -p $PKG/usr/lib/live/$dir
+		cp -r $dir/*.a $dir/include $PKG/usr/lib/live/$dir
+	done
+
+	mkdir -p $PKG/usr/bin
+	for testprog in `find testProgs -type f -perm 755`; do
+		install $testprog $PKG/usr/bin
+	done
+
+	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
+	ln -s libliveMedia.so.$version $PKG/usr/lib/libliveMedia.so
+
 }