[SCM] xbmc packaging branch, master, updated. upstream/9.11.svn24886.deb1-50-g9211db5
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Thu Dec 3 03:27:44 UTC 2009
The following commit has been merged in the master branch:
commit 9211db5709e463d722112b322e1bcc07c6e70d58
Author: Andres Mejia <mcitadel at gmail.com>
Date: Wed Dec 2 22:26:30 2009 -0500
Explicitely enable configure options to make packaging consistent on different systems.
Also fix issue with checking for svn revision.
diff --git a/debian/rules b/debian/rules
index dea7cf1..82cdb77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
# Get the SVN revision from the changelog
-SVNVERSION ?= $(shell dpkg-parsechangelog | grep '^Version:' | sed 's/.*svn\([[:digit:]]*\).*/\1/')
+SVNVERSION ?= $(shell dpkg-parsechangelog | grep '^Version:' | grep svn | sed 's/.*svn\([[:digit:]]*\).*/\1/')
# If not set already, try to set from debian/svnrevision
ifeq (,$(SVNVERSION))
@@ -15,9 +15,11 @@ endif
# List of options to pass to configure. Can be overridden.
XBMC_CONFIG_OPTIONS ?= --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-ccache \
- --enable-goom --enable-avahi --enable-vdpau \
- --enable-external-libraries --disable-dvdcss
+ --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
+ --enable-debug --enable-optimizations --enable-gl --enable-vdpau \
+ --disable-profiling --enable-joystick --enable-xrandr --enable-goom \
+ --disable-ccache --enable-pulse --disable-dvdcss --enable-avahi \
+ --disable-non-free --enable-external-libraries
# Ubuntu or Debian specific options
ifeq (Ubuntu,$(shell lsb_release -is))
--
xbmc packaging
More information about the pkg-multimedia-commits
mailing list