diff options
| author | wattazoum <wattazoum@svn> | 2009-12-01 06:30:24 +0000 |
|---|---|---|
| committer | wattazoum <wattazoum@svn> | 2009-12-01 06:30:24 +0000 |
| commit | 467ff0a089344f4f64445b1b4027e5c69b2d11b6 (patch) | |
| tree | 959a6aa4669f7a5bac197f30f8dbfa6aba42681e /tools/Linux | |
| parent | dafbd8be8e225ad954d69204902c1fc7d91b8709 (diff) | |
* enable externals libs for ubuntu.
* remove hardy tweaking
* add vdpau to Ubuntu build depends
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@25154 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'tools/Linux')
| -rwxr-xr-x | tools/Linux/packaging/debian/rules | 4 | ||||
| -rw-r--r-- | tools/Linux/packaging/debian/var_info | 2 | ||||
| -rwxr-xr-x | tools/Linux/packaging/ppa-builder.sh | 22 |
3 files changed, 3 insertions, 25 deletions
diff --git a/tools/Linux/packaging/debian/rules b/tools/Linux/packaging/debian/rules index 8877bc6cb0..d6be4e1cf7 100755 --- a/tools/Linux/packaging/debian/rules +++ b/tools/Linux/packaging/debian/rules @@ -15,7 +15,7 @@ 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-goom --enable-avahi --enable-external-libraries \ CFLAGS="$(DEB_CFLAGS)" CXXFLAGS="$(DEB_CXXFLAGS)" # Add the SVN revision if it exists in the changelog @@ -25,7 +25,7 @@ endif # Ubuntu or Debian specific options ifneq (Ubuntu,$(shell lsb_release -is)) - XBMC_CONFIG_OPTIONS += --disable-dvdcss --enable-external-libraries + XBMC_CONFIG_OPTIONS += --disable-dvdcss else XBMC_CONFIG_OPTIONS += --enable-vdpau endif diff --git a/tools/Linux/packaging/debian/var_info b/tools/Linux/packaging/debian/var_info index 25c3a82b8d..3267a209a3 100644 --- a/tools/Linux/packaging/debian/var_info +++ b/tools/Linux/packaging/debian/var_info @@ -20,7 +20,7 @@ BUILD_DEPENDS="debhelper (>= 7.0.50), python-support, cmake, libssl-dev, lsb-release," if [ $(lsb_release -is) = "Ubuntu" ]; then - BUILD_DEPENDS="$BUILD_DEPENDS libfaac-dev," + BUILD_DEPENDS="$BUILD_DEPENDS libfaac-dev, nvidia-190-libvdpau-dev," fi case "$1" in diff --git a/tools/Linux/packaging/ppa-builder.sh b/tools/Linux/packaging/ppa-builder.sh index 5d87791923..e3ea0b824a 100755 --- a/tools/Linux/packaging/ppa-builder.sh +++ b/tools/Linux/packaging/ppa-builder.sh @@ -118,19 +118,10 @@ builddeb() dch -b -v 1:${VERSION}-$1${MINOR} -D $1 "$CHNLG" 2>&1 echo "$REVISION" > debian/svnrevision echo "Building the $1 debian package" - - if [ $1 == "hardy" ]; then - tweaks_for_hardy - fi echo "move the format spec to 1.0 (Ubuntu PPA doesn't support format 3.0 quilt) " echo "1.0" > debian/source/format - # Add vdpau dependencies - mv debian/control debian/control.orig - sed s/"cmake,"/"cmake, nvidia-190-libvdpau-dev,"/ debian/control.orig > debian/control - rm debian/control.orig - if [[ $BUILT_ONCE ]]; then debuild $DEBUILDOPTS 2>&1 else @@ -151,19 +142,6 @@ builddeb() fi } -tweaks_for_hardy() -{ - echo "Hardy tweaking ..." - echo "change debhelper version in control" - mv debian/control debian/control.orig - sed -r s/"debhelper \(>= .+?\)"/"debhelper (>= 7)"/ debian/control.orig > debian/control - rm debian/control.orig - - echo "change the rules file." - rm -f debian/rules - cp debian/rules.hardy debian/rules -} - clean() { if [[ -z $NOCLEAN ]] && [[ -z $LOCAL ]] ; then |