[SCM] xbmc packaging branch, master, updated. upstream/9.11.svn24886.deb1-44-g5d70c70
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Tue Dec 1 16:24:24 UTC 2009
The following commit has been merged in the master branch:
commit 54dd90366519bbe99557680fe2ee4a9202d226e5
Author: Andres Mejia <mcitadel at gmail.com>
Date: Tue Dec 1 11:12:06 2009 -0500
Introduce changes in debian/rules to build packages for Debian and Ubuntu
This will now autogenerate a control file when cleaning. This also changes
what configuration options to activate when building xbmc.
The svn revision can be set by the debian changelog or the file
debian/svnrevision.
This also introduces another package, xbmc-eventclients-xbmc-send
diff --git a/debian/control b/debian/control
index a7eb2f9..10825d9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,20 +6,21 @@ Uploaders: Ouattara Oumar Aziz (alias wattazoum) <wattazoum at gmail.com>,
Andres Mejia <mcitadel at gmail.com>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50), python-support, cmake,
- autotools-dev, autoconf, automake, unzip, libboost-dev,
- libgl1-mesa-dev | libgl-dev, libglu-dev, libglew-dev, libmad0-dev, libjpeg-dev,
- libsamplerate-dev, libogg-dev, libvorbis-dev, libfreetype6-dev,
+ autotools-dev, autoconf, automake, unzip, libboost-dev, zip, libtool,
+ libgl1-mesa-dev | libgl-dev, libglu-dev, libglew-dev, libmad0-dev,
+ libjpeg-dev, libsamplerate-dev, libogg-dev, libvorbis-dev, libfreetype6-dev,
libfontconfig-dev, libbz2-dev, libfribidi-dev, libsqlite3-dev,
libmysqlclient-dev, libasound-dev, libpng-dev, libpcre3-dev, liblzo2-dev,
- libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libenca-dev,
- libjasper-dev, libxt-dev, libxtst-dev, libxmu-dev, libxinerama-dev,
- libcurl4-gnutls-dev | libcurl-dev, libdbus-1-dev, libhal-storage-dev,
- libhal-dev, libpulse-dev, libavahi-common-dev, libavahi-client-dev,
- libxrandr-dev, libavcodec-dev, libavformat-dev, libavutil-dev, libpostproc-dev,
- libswscale-dev, liba52-dev, libdts-dev, libmpeg2-4-dev, libass-dev,
- libmpcdec-dev, libflac-dev, libwavpack-dev, python-dev, gawk, gperf,
- nasm [!amd64], libcwiid1-dev, libbluetooth-dev, zlib1g-dev, libmms-dev,
- libsmbclient-dev, libfaad-dev, libiso9660-dev, libssl-dev,
+ libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
+ libenca-dev, libjasper-dev, libxt-dev, libxtst-dev, libxmu-dev,
+ libxinerama-dev, libcurl4-gnutls-dev | libcurl-dev, libdbus-1-dev,
+ libhal-storage-dev, libhal-dev, libpulse-dev, libavahi-common-dev,
+ libavahi-client-dev, libxrandr-dev, libavcodec-dev, libavformat-dev,
+ libavutil-dev, libpostproc-dev, libswscale-dev, liba52-dev, libdts-dev,
+ libmpeg2-4-dev, libass-dev, libmpcdec-dev, libflac-dev, libwavpack-dev,
+ python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev, libbluetooth-dev,
+ zlib1g-dev, libmms-dev, libsmbclient-dev, libfaad-dev, libiso9660-dev,
+ libssl-dev, lsb-release,
Standards-Version: 3.8.3
Homepage: http://xbmc.org/
Vcs-Git: git://git.debian.org/git/pkg-multimedia/xbmc.git
@@ -470,3 +471,28 @@ Description: XBMC Media Center (Event Client PS3 package)
multimedia jukebox.
.
This package is the PS3 package for XBMC Event Client.
+
+Package: xbmc-eventclients-xbmc-send
+Architecture: all
+Depends: xbmc-eventclients-common (= ${binary:Version}),
+ ${python:Depends},
+ ${misc:Depends}
+Description: XBMC Media Center (Event Client XBMC-SEND package)
+ XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
+ open source software media-player and entertainment hub for all your digital
+ media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
+ and Microsoft Windows, as well as the original Xbox game console. Created in
+ 2003 by a group of like minded programmers, XBMC is a non-profit project run
+ and developed by volunteers located around the world. More than 50 software
+ developers have contributed to XBMC, and 100-plus translators have worked to
+ expand its reach, making it available in more than 30 languages.
+ .
+ While XBMC functions very well as a standard media player application for
+ your computer, it has been designed to be the perfect companion for your
+ HTPC. Supporting an almost endless range of remote controls, and combined
+ with its beautiful interface and powerful skinning engine, XBMC feels very
+ natural to use from the couch and is the ideal solution for your home
+ theater. Once installed, your computer will become a fully functional
+ multimedia jukebox.
+ .
+ This package is the XBMC-SEND package for XBMC Event Client.
diff --git a/debian/control b/debian/control.in
similarity index 94%
copy from debian/control
copy to debian/control.in
index a7eb2f9..dc45d55 100644
--- a/debian/control
+++ b/debian/control.in
@@ -5,21 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
Uploaders: Ouattara Oumar Aziz (alias wattazoum) <wattazoum at gmail.com>,
Andres Mejia <mcitadel at gmail.com>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50), python-support, cmake,
- autotools-dev, autoconf, automake, unzip, libboost-dev,
- libgl1-mesa-dev | libgl-dev, libglu-dev, libglew-dev, libmad0-dev, libjpeg-dev,
- libsamplerate-dev, libogg-dev, libvorbis-dev, libfreetype6-dev,
- libfontconfig-dev, libbz2-dev, libfribidi-dev, libsqlite3-dev,
- libmysqlclient-dev, libasound-dev, libpng-dev, libpcre3-dev, liblzo2-dev,
- libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libenca-dev,
- libjasper-dev, libxt-dev, libxtst-dev, libxmu-dev, libxinerama-dev,
- libcurl4-gnutls-dev | libcurl-dev, libdbus-1-dev, libhal-storage-dev,
- libhal-dev, libpulse-dev, libavahi-common-dev, libavahi-client-dev,
- libxrandr-dev, libavcodec-dev, libavformat-dev, libavutil-dev, libpostproc-dev,
- libswscale-dev, liba52-dev, libdts-dev, libmpeg2-4-dev, libass-dev,
- libmpcdec-dev, libflac-dev, libwavpack-dev, python-dev, gawk, gperf,
- nasm [!amd64], libcwiid1-dev, libbluetooth-dev, zlib1g-dev, libmms-dev,
- libsmbclient-dev, libfaad-dev, libiso9660-dev, libssl-dev,
+Build-Depends: #BUILD_DEPENDS#
Standards-Version: 3.8.3
Homepage: http://xbmc.org/
Vcs-Git: git://git.debian.org/git/pkg-multimedia/xbmc.git
@@ -470,3 +456,28 @@ Description: XBMC Media Center (Event Client PS3 package)
multimedia jukebox.
.
This package is the PS3 package for XBMC Event Client.
+
+Package: xbmc-eventclients-xbmc-send
+Architecture: all
+Depends: xbmc-eventclients-common (= ${binary:Version}),
+ ${python:Depends},
+ ${misc:Depends}
+Description: XBMC Media Center (Event Client XBMC-SEND package)
+ XBMC, recursive acronym for "XBMC Media Center", is an award winning free and
+ open source software media-player and entertainment hub for all your digital
+ media. XBMC is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
+ and Microsoft Windows, as well as the original Xbox game console. Created in
+ 2003 by a group of like minded programmers, XBMC is a non-profit project run
+ and developed by volunteers located around the world. More than 50 software
+ developers have contributed to XBMC, and 100-plus translators have worked to
+ expand its reach, making it available in more than 30 languages.
+ .
+ While XBMC functions very well as a standard media player application for
+ your computer, it has been designed to be the perfect companion for your
+ HTPC. Supporting an almost endless range of remote controls, and combined
+ with its beautiful interface and powerful skinning engine, XBMC feels very
+ natural to use from the couch and is the ideal solution for your home
+ theater. Once installed, your computer will become a fully functional
+ multimedia jukebox.
+ .
+ This package is the XBMC-SEND package for XBMC Event Client.
diff --git a/debian/rules b/debian/rules
index 6366eb6..caa42ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,30 +8,54 @@ 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/')
+# If not set already, try to set from debian/svnrevision
+ifeq (,$(SVNVERSION))
+ SVNVERSION = $(shell cat debian/svnrevision 2>/dev/null)
+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 \
- --disable-dvdcss --enable-external-libraries --enable-avahi \
- --enable-goom CFLAGS="$(DEB_CFLAGS)" CXXFLAGS="$(DEB_CXXFLAGS)"
+ --enable-goom --enable-avahi --enable-vdpau \
+ --enable-external-libraries --disable-dvdcss
+
+# Ubuntu or Debian specific options
+ifeq (Ubuntu,$(shell lsb_release -is))
+ XBMC_CONFIG_OPTIONS += --enable-faac
+endif
-# Add the SVN revision if it exists in the changelog
-ifeq (,$(findstring Version,$(SVNVERSION)))
+# Add the SVN revision if we could determine the svn revision
+ifneq (,$(SVNVERSION))
XBMC_CONFIG_OPTIONS += SVN_REV="$(SVNVERSION)"
endif
+# Various environment variables to set
+XBMC_CONFIG_OPTIONS += CFLAGS="$(DEB_CFLAGS)" CXXFLAGS="$(DEB_CXXFLAGS)"
+
+# Input files used for generating other files
+INPUT_FILES = debian/control.in \
+
%:
dh $@
+# Target for generating control files
+.PHONY: debian/var_info
+%.in: debian/var_info
+ perl -p \
+ -e 's{#BUILD_DEPENDS#}{qx(sh debian/var_info BUILD_DEPENDS)}ge;' \
+ < $@ > $$(echo $@ | sed 's/\.in$$//')
+
override_dh_clean:
dh_clean
- rm -f debian/xbmc-live.init
+ debian/rules $(INPUT_FILES)
-override_dh_auto_configure:
- cp -f tools/XBMCLive/xbmc-live debian/xbmc-live.init
+override_dh_auto_configure: configure
./configure $(XBMC_CONFIG_OPTIONS)
override_dh_auto_install:
$(MAKE) install install-livedatas prefix=$(CURDIR)/debian/tmp/usr
+ install -D -m 0644 $(CURDIR)/tools/XBMCLive/xbmc-live.conf \
+ $(CURDIR)/debian/tmp/etc/init/xbmc-live.conf
find "debian/tmp/usr/share/xbmc" -regextype posix-extended \
-type f -iregex \
".*\.so|.*\.vis|.*\.xbs|.*xbmc\.bin|.*xbmc-xrandr" | \
diff --git a/debian/var_info b/debian/var_info
new file mode 100644
index 0000000..25c3a82
--- /dev/null
+++ b/debian/var_info
@@ -0,0 +1,32 @@
+# -*- sh -*-
+# This is a file run by sh used for replacing certain variables from input
+# files in the XBMC packaging.
+
+BUILD_DEPENDS="debhelper (>= 7.0.50), python-support, cmake,
+ autotools-dev, autoconf, automake, unzip, libboost-dev, zip, libtool,
+ libgl1-mesa-dev | libgl-dev, libglu-dev, libglew-dev, libmad0-dev,
+ libjpeg-dev, libsamplerate-dev, libogg-dev, libvorbis-dev, libfreetype6-dev,
+ libfontconfig-dev, libbz2-dev, libfribidi-dev, libsqlite3-dev,
+ libmysqlclient-dev, libasound-dev, libpng-dev, libpcre3-dev, liblzo2-dev,
+ libcdio-dev, libsdl-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev,
+ libenca-dev, libjasper-dev, libxt-dev, libxtst-dev, libxmu-dev,
+ libxinerama-dev, libcurl4-gnutls-dev | libcurl-dev, libdbus-1-dev,
+ libhal-storage-dev, libhal-dev, libpulse-dev, libavahi-common-dev,
+ libavahi-client-dev, libxrandr-dev, libavcodec-dev, libavformat-dev,
+ libavutil-dev, libpostproc-dev, libswscale-dev, liba52-dev, libdts-dev,
+ libmpeg2-4-dev, libass-dev, libmpcdec-dev, libflac-dev, libwavpack-dev,
+ python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev, libbluetooth-dev,
+ zlib1g-dev, libmms-dev, libsmbclient-dev, libfaad-dev, libiso9660-dev,
+ libssl-dev, lsb-release,"
+
+if [ $(lsb_release -is) = "Ubuntu" ]; then
+ BUILD_DEPENDS="$BUILD_DEPENDS libfaac-dev,"
+fi
+
+case "$1" in
+ BUILD_DEPENDS)
+ printf "$BUILD_DEPENDS"
+ ;;
+esac
+
+exit 0
--
xbmc packaging
More information about the pkg-multimedia-commits
mailing list