Package: xine-lib
Severity: important
Version: 1.1.8-2
Tags: patch
User: [EMAIL PROTECTED]
Usertags: kfreebsd
Hi,
the current version fails to build on GNU/kFreeBSD.
It needs upstream fixes from (just updated) #438849
and also changes for debian packaging.
Please find attached patch with changes to debian packaging.
Thanks in advance
Petrdiff -u xine-lib-1.1.8/debian/control xine-lib-1.1.8/debian/control
--- xine-lib-1.1.8/debian/control
+++ xine-lib-1.1.8/debian/control
@@ -10,6 +10,7 @@
libxcb-xv0-dev, libxcb-shm0-dev, libxcb-shape0-dev,
libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libcam-dev [kfreebsd-i386 kfreebsd-amd64],
libaa1-dev, libcaca-dev, libmodplug-dev,
libmagick9-dev, libpng12-dev, libfreetype6-dev,
libogg-dev, libvorbis-dev, libtheora-dev,
diff -u xine-lib-1.1.8/debian/rules xine-lib-1.1.8/debian/rules
--- xine-lib-1.1.8/debian/rules
+++ xine-lib-1.1.8/debian/rules
@@ -69,12 +69,12 @@
dh_testroot
rm -vf build-stamp configure-stamp install-stamp po/*.gmo po/stamp-po
binary-*-stamp all-files-stamp
[ ! -f Makefile ] || $(MAKE) distclean
- rm -vf debian/libxine1.install.i386 config.h config.log
+ rm -vf debian/libxine1.install.i386 debian/libxine*.install.kfreebsd*
config.h config.log
dh_clean
rm -vf a.out # something in the configure scripts seems to leave this
over...
install: build install-stamp
-install-stamp:
+install-stamp: generate-arch-files
dh_testdir
dh_testroot
dh_clean -k
@@ -141,16 +141,21 @@
@echo Comparing installed files from xine-lib Makefiles with files
installed in packages:
-diff -u $^
-# if there is a file like debian/libxine1.install.i386.specific, this rule
will be triggered
-debian/%.install.$(DEB_HOST_ARCH): debian/%.install
debian/%.install.$(DEB_HOST_ARCH).specific
- cat $^ > $@
-
-# i386 is special cased! Other archs may follow
-ifeq ($(DEB_HOST_ARCH),i386)
-binary-libxine1: debian/libxine1.install
debian/libxine1.install.$(DEB_HOST_ARCH)
-else
-binary-libxine1: debian/libxine1.install
-endif
+generate-arch-files:
+# i386 specific plugins are also available for kfreebsd-i386
+ cat debian/libxine1.install debian/libxine1.install.i386.specific >
debian/libxine1.install.i386
+ cp -a debian/libxine1.install.i386 debian/libxine1.install.kfreebsd-i386
+# create install files for Debian GNU/kFreeBSD i386/amd64 by dropping
+# everything which is not available on those architectures.
+ grep -v -e dxr3 -e syncfb \
+ debian/libxine1-x.install >
debian/libxine1-x.install.kfreebsd-i386
+ cp -p debian/libxine1-x.install.kfreebsd-i386
debian/libxine1-x.install.kfreebsd-amd64
+ grep -v -e dxr3 -e pvr -e v4l -e alsa \
+ debian/libxine1-misc-plugins.install >
debian/libxine1-misc-plugins.install.kfreebsd-i386
+ cp -p debian/libxine1-misc-plugins.install.kfreebsd-i386
debian/libxine1-misc-plugins.install.kfreebsd-amd64
+ grep -v -e out_fb \
+ debian/libxine1-console.install >
debian/libxine1-console.install.kfreebsd-i386
+ cp -p debian/libxine1-console.install.kfreebsd-i386
debian/libxine1-console.install.kfreebsd-amd64
# Any other binary targets build just one binary package at a time.
binary-%: build install