[SCM] VLC media player packaging branch, experimental, updated. debian/1.0.6-1-32-gae1a772
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Thu Jun 17 00:18:34 UTC 2010
The following commit has been merged in the experimental branch:
commit 79c7bf2b1491ca6d03445460eada61629bfe475d
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Thu Jun 17 01:21:15 2010 +0200
Install the optim only if present
Feel a bit like a hack and diverge from our habit of controlling quite precisely what is installed.
diff --git a/debian/rules b/debian/rules
index b6e030d..6694ff2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,6 +155,8 @@ clean:
dh_testdir
dh_testroot
rm -f build-stamp
+ [ ! -f debian/vlc-nox.install.bak ] || mv -f debian/vlc-nox.install.bak \
+ debian/vlc-nox.install
rm -f debian/vlc-nox.install.kfreebsd
rm -f debian/vlc-nox.install.hurd
# Clean VLC
@@ -175,12 +177,20 @@ install: build
dh_testdir
dh_testroot
dh_prep
+ dh_installdirs
+# Add the optimization dirs only if present
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
+ cp debian/vlc-nox.install debian/vlc-nox.install.bak
+ for dir in sse2 3dnow altivec arm_neon mmx mmxext ; do \
+ if test -d debian/tmp/usr/lib/vlc/plugins/$${dir}; then \
+ echo usr/lib/vlc/plugins/$${dir} >> debian/vlc-nox.install ; \
+ fi ; \
+ done
+# Remove some modules on non-linux arch
sed -e '/\(lib\|libaccess_\)\(alsa\|dv\|dvb\|fb\|v4l\|v4l2\|pvr\)_/d' \
debian/vlc-nox.install > debian/vlc-nox.install.kfreebsd
sed -e '/\(lib\|libaccess_\)\(probe_hal\)_/d' \
debian/vlc-nox.install.kfreebsd > debian/vlc-nox.install.hurd
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
cp tmp/libvlc.a debian/tmp/usr/lib
cp tmp/libvlccore.a debian/tmp/usr/lib
# Clean up libtool crap
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index c4396f3..fc3cfd4 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -4,7 +4,6 @@ usr/bin/rvlc
usr/bin/vlc
usr/bin/vlc-wrapper
usr/lib/vlc/lua/
-usr/lib/vlc/plugins/3dnow
usr/lib/vlc/plugins/access/libaccess_alsa_plugin.so
usr/lib/vlc/plugins/access/libaccess_attachment_plugin.so
usr/lib/vlc/plugins/access/libaccess_avio_plugin.so
@@ -99,8 +98,6 @@ usr/lib/vlc/plugins/misc/libtelepathy_plugin.so
usr/lib/vlc/plugins/misc/libvod_rtsp_plugin.so
usr/lib/vlc/plugins/misc/libxml_plugin.so
usr/lib/vlc/plugins/misc/libxtag_plugin.so
-usr/lib/vlc/plugins/mmx
-usr/lib/vlc/plugins/mmxext
usr/lib/vlc/plugins/mux
usr/lib/vlc/plugins/packetizer
usr/lib/vlc/plugins/services_discovery
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list