[SCM] VLC media player packaging branch, sid, updated. debian/0.9.9a-1-12-gd518d89

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit d518d892af650f5796ce38e1ea644b074af5683f
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Tue Apr 28 12:22:39 2009 +0200

    Build a version of libvlccore without altivec
    
    Closes: #523035

diff --git a/debian/libvlccore0.install b/debian/libvlccore0.install
index 2c18f04..4405e98 100644
--- a/debian/libvlccore0.install
+++ b/debian/libvlccore0.install
@@ -1 +1 @@
-usr/lib/libvlccore.so.*
+usr/lib/{,*/}libvlccore.so.*
diff --git a/debian/rules b/debian/rules
index 45c4eef..b477041 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,11 +113,18 @@ PIXDIR := usr/share/pixmaps
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
+	# We need to build the static library apart
+	# Else it's a mess when we build the modules
 	./configure --enable-static $(confflags)
 	$(MAKE) -C src libvlccore.la libvlc.la
 	mkdir -p tmp
 	cp src/.libs/libvlccore.a tmp/libvlccore.a
 	cp src/.libs/libvlc.a tmp/libvlc.a
+	# build an altivec free version on powerpc for the G3
+ifneq ($(filter $(DEB_HOST_ARCH), powerpc),)
+	./configure --disable-altivec $(confflags)
+	cp -vd src/.libs/libvlccore.so.* tmp/
+endif
 	./configure $(confflags)
 	$(MAKE)
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
@@ -166,6 +173,11 @@ install: build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
 	cp tmp/libvlc.a debian/tmp/usr/lib
 	cp tmp/libvlccore.a debian/tmp/usr/lib
+ifneq ($(filter $(DEB_HOST_ARCH), powerpc),)
+	mkdir -p debian/tmp/usr/lib/altivec/
+	mv -v debian/tmp/usr/lib/libvlccore.so.* debian/tmp/usr/lib/altivec/
+	cp -vd tmp/libvlccore.so.* debian/tmp/usr/lib/
+endif
 	# Clean up libtool crap
 	find debian/tmp -name '*.la' -exec rm '{}' ';'
 	# Remove useless stuff

-- 
VLC media player packaging