[SCM] xbmc/wheezy-backports: Merge tag 'debian/2%13.2+dfsg1-3' into wheezy-backports
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Sun Nov 2 10:39:39 UTC 2014
Finalize changelog
Fix FTBFS with packaged FFmpeg
Fix MIPS build by patching upstream
Use OpenGL, not OpenGL ES for MIPS
Let configure fail on unknown architectures
Use X11 and SDL on MIPS
Enable using SDL
Refresh patches after adding MIPS support
Patch upstream to support MIPS
Use OpenGL ES and Bellagio OpenMAX Integration Layer on MIPS
Ship xbmc-dbg package only on amd64 and i386 architectures
Use VDPAU in Libav hacks only when VDPAU support is enabled
Start working on next upload
Finalize changelog
Fix XBMC's VDPAU API usage with patch from Libav
Always pass --enable-debug to configure to generate debug symbols
Provide debug symbols in a separate package
Start working on next upload
Finalize changelog
Refresh patches
Merge tag 'upstream/13.2+dfsg1'
Imported Upstream version 13.2+dfsg1
Ignore missing version check plugin during package build
Remove obsolete files related to Windows build from source tarball
Don't download RSS feed from XBMC.org by default
Really exclude version check addon from source tarball
Ship xbmc.service file as an example only
Ship systemd .services file
Fall back to old location of libhdhomerun includes if needed
Fall back to old location of DejaVuSans.ttf if needed
Update changelog
Merge tag 'upstream/13.1+dfsg1'
Imported Upstream version 13.1+dfsg1
libcwiid-dev is present only on Linux
Start working on next upload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/wheezy-backports
X-Git-Reftype: branch
X-Git-Oldrev: 53f67b112268cfc089afd339aa3657cd2af340a6
X-Git-Newrev: 534d2d69f83bf53f1352d3fe9fa3cca302428e76
The following commit has been merged in the wheezy-backports branch:
commit 534d2d69f83bf53f1352d3fe9fa3cca302428e76
Merge: 53f67b112268cfc089afd339aa3657cd2af340a6 f55d63df02552c88c7fb156fe1c0932bc5a6051e
Author: Balint Reczey <balint at balintreczey.hu>
Date: Sat Nov 1 22:11:47 2014 +0100
Merge tag 'debian/2%13.2+dfsg1-3' into wheezy-backports
xbmc Debian release 2:13.2+dfsg1-3
Conflicts:
debian/changelog
diff --combined debian/changelog
index fa4631b,543011f..2ac94a8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,51 +1,58 @@@
- xbmc (2:13.1~rc1+dfsg1-1~bpo70+1) wheezy-backports; urgency=low
++xbmc (2:13.2+dfsg1-3~bpo70+1) wheezy-backports; urgency=low
+
+ * Rebuild for wheezy-backports.
+ * Build-depend on ttf-dejavu-core instead of fonts-dejavu-core
++
++ -- Balint Reczey <balint at balintreczey.hu> Sat, 01 Nov 2014 22:11:02 +0100
++
+ xbmc (2:13.2+dfsg1-3) unstable; urgency=medium
+
+ [ Balint Reczey ]
+ * Use VDPAU in Libav hacks only when VDPAU support is enabled.
+ Fixes FTBFS on arches without VDPAU. (Closes: #766190)
+ * Ship xbmc-dbg package only on amd64 and i386 architectures.
+ This saves place on mirrors and those two architectures are the most
+ popular ones among bug submitters.
+ * Use OpenGL and Bellagio OpenMAX Integration Layer on MIPS
+ * Patch upstream to support MIPS
+ * Refresh patches after adding MIPS support
+ * Enable using SDL in configure
+ * Use X11 and SDL on MIPS
+ * Let configure fail on unknown architectures
+
+ [ Andreas Cadhalpun ]
+ * Fix FTBFS with packaged FFmpeg (Closes: #766680)
+
+ -- Balint Reczey <balint at balintreczey.hu> Wed, 08 Oct 2014 15:17:35 +0200
+
+ xbmc (2:13.2+dfsg1-2) unstable; urgency=medium
+
+ * Provide debug symbols in a separate package (Closes: #763627)
+ * Always pass --enable-debug to configure to generate debug symbols
+ * Fix XBMC's VDPAU API usage with patch from Libav
+ (Closes: #750199, #742896, #745060, #750603)
+
+ -- Balint Reczey <balint at balintreczey.hu> Mon, 06 Oct 2014 22:42:34 +0200
+
+ xbmc (2:13.2+dfsg1-1) unstable; urgency=low
+
+ [ Ritesh Raj Sarraf ]
+ * Ship systemd .services file (Closes: #751667)
+
+ [ Balint Reczey ]
+ * XBMC 13.2 Gotham
+ - release notes: http://xbmc.org/xbmc-13-2-gotham-final-release
+ * Refresh patches
+ * libcwiid-dev is present only on Linux
* Fall back to old location of DejaVuSans.ttf if needed.
+ This helps backporting.
* Fall back to old location of libhdhomerun includes if needed
+ * Ship xbmc.service file as an example only
+ * Really exclude version check addon from source tarball
+ * Don't download RSS feed from XBMC.org by default
+ * Remove obsolete files related to Windows build from source tarball
- -- Balint Reczey <balint at balintreczey.hu> Mon, 23 Jun 2014 21:55:22 +0200
+ -- Balint Reczey <balint at balintreczey.hu> Thu, 25 Sep 2014 10:36:54 +0200
xbmc (2:13.1~rc1+dfsg1-1) unstable; urgency=low
@@@ -14,7 -54,7 +61,7 @@@
* Always enable parallel builds
* Refresh patches
- -- Balint Reczey <balint at balintreczey.hu> Sat, 21 Jun 2014 08:24:02 -0700
+ -- Balint Reczey <balint at balintreczey.hu> Wed, 04 Jun 2014 18:36:41 +0700
xbmc (2:13.1~beta2+dfsg1-1) unstable; urgency=low
diff --combined debian/control
index b6f2551,8b4582d..f7306dc
--- a/debian/control
+++ b/debian/control
@@@ -3,8 -3,8 +3,8 @@@ Section: vide
Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: Balint Reczey <balint at balintreczey.hu>
-Build-Depends: debhelper (>= 9~),
- dh-python,
+Build-Depends: debhelper (>= 7.0.50~),
+ python-support,
cmake,
autopoint,
autotools-dev,
@@@ -56,13 -56,13 +56,13 @@@
gperf,
nasm [i386],
yasm,
- libcwiid-dev,
+ libcwiid-dev [linux-any],
libbluetooth-dev,
zlib1g-dev,
libsmbclient-dev,
libiso9660-dev,
libssl-dev,
- libvdpau-dev [!armel !armhf],
+ libvdpau-dev [!armel !armhf !mipsel !mips],
libmicrohttpd-dev,
libmodplug-dev,
librtmp-dev,
@@@ -70,7 -70,7 +70,7 @@@
curl,
libyajl-dev,
libboost-thread-dev,
- libomxil-bellagio-dev [armel armhf],
+ libomxil-bellagio-dev [armel armhf mipsel mips],
python-imaging,
libplist-dev,
libcec-dev (>= 2),
@@@ -88,7 -88,7 +88,7 @@@
swig,
default-jre,
libbluray-dev,
- libva-dev [!armel !armhf],
+ libva-dev [!armel !armhf !mipsel !mips],
libavcodec-dev (>= 6:10~),
libavfilter-dev,
libavformat-dev,
@@@ -106,7 -106,7 +106,7 @@@
libdvdread-dev,
libhdhomerun-dev,
fontforge,
- fonts-dejavu-core,
+ ttf-dejavu-core,
fonts-droid,
ttf-bitstream-vera
Standards-Version: 3.9.5
@@@ -182,6 -182,32 +182,32 @@@ Description: XBMC Media Center (binary
.
This package contains all the binary data needed to have a working XBMC.
+ Package: xbmc-dbg
+ Priority: extra
+ Architecture: amd64 i386
+ Section: debug
+ Depends: ${misc:Depends}, xbmc-bin (= ${binary:Version})
+ Description: XBMC Media Center - debug symbols
+ 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 contains debug symbols for the XBMC binary packages.
+
+
Package: xbmc-eventclients-common
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
diff --combined debian/rules
index 60018ca,1bc1ca6..40ae336
--- a/debian/rules
+++ b/debian/rules
@@@ -6,22 -6,6 +6,6 @@@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-arc
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
- # Set this variable to yes for release builds to disable debugging and enable
- # optimizations.
- # NOTE: DEB_BUILD_OPTIONS must have 'nostrip' otherwise debugging symbols will
- # be stripped from binaries.
- XBMC_RELEASE ?= yes
- ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- XBMC_RELEASE ?= no
- endif
-
- # Whether we're building for release or not
- ifeq (yes,$(XBMC_RELEASE))
- DEBUG_OPTIONS = --disable-debug --enable-optimizations
- else
- DEBUG_OPTIONS = --enable-debug --disable-optimizations
- endif
-
ifeq (,$(filter i386 amd64,$(DEB_HOST_ARCH)))
ARCH_SPECIFIC_OPTIONS = --disable-crystalhd
else
@@@ -29,16 -13,24 +13,24 @@@
ARCH_SPECIFIC_LIB_RECOMMENDS = -lcrystalhd
endif
- # Enable gles for armel and armhf
- # Also disable VDPAU and VAAPI there since they break the build with gles
- ifeq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
GL_CONFIG_OPTIONS = --enable-gl --disable-gles --enable-vdpau
- ARCH_SPECIFIC_LIB_RECOMMENDS += -lvdpau
+ ARCH_SPECIFIC_LIB_RECOMMENDS_ADD = -lvdpau
+
+ # Enable gles for armel, armhf
+ # Also disable VDPAU and VAAPI there since they break the build with gles
+ ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
+ GL_CONFIG_OPTIONS = --disable-gl --enable-gles --disable-vdpau --disable-vaapi
+ ARCH_SPECIFIC_LIB_RECOMMENDS_ADD =
else
- GL_CONFIG_OPTIONS = --disable-gl --enable-gles --disable-vdpau \
- --disable-vaapi
+ # Enable OpenGL but no VDPAU or VAAPI for MIPS
+ ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
+ GL_CONFIG_OPTIONS = --enable-gl --disable-gles --disable-vdpau --disable-vaapi
+ ARCH_SPECIFIC_LIB_RECOMMENDS_ADD =
+ endif
endif
+ ARCH_SPECIFIC_LIB_RECOMMENDS += $(ARCH_SPECIFIC_LIB_RECOMMENDS_ADD)
+
# Various environment variables to set
DEB_CFLAGS ?= $(shell dpkg-buildflags --get CPPFLAGS) \
$(filter-out -g -O2, $(shell dpkg-buildflags --get CFLAGS))
@@@ -59,7 -51,7 +51,7 @@@ endi
XBMC_CONFIG_OPTIONS ?= --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --docdir=/usr/share/doc/xbmc \
- $(DEBUG_OPTIONS) \
+ --enable-debug \
$(GL_CONFIG_OPTIONS) \
--disable-vdadecoder \
--disable-vtbdecoder \
@@@ -68,6 -60,7 +60,7 @@@
--disable-profiling \
--enable-joystick \
--enable-xrandr \
+ --enable-sdl \
--enable-pulse \
--enable-rtmp \
--enable-ffmpeg-libvorbis \
@@@ -106,7 -99,6 +99,7 @@@ override_dh_clean
# Use package's version in XBMC
VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*\)/\1/p')
+GIMP_FAKE_HOMEDIR = $(CURDIR)/debian/tmp/home/user
# fall back to old location of DejaVuSans.ttf if needed
ifneq ("$(wildcard /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf)","")
@@@ -117,7 -109,7 +110,6 @@@ endi
override_dh_auto_configure: configure
sed -i 's/DEB_VERSION/"'$(VERSION)'"/' xbmc/GUIInfoManager.cpp
- rm -r addons/service.xbmc.versioncheck
- -rm -r addons/service.xbmc.versioncheck
mkdir -p xbmc/visualizations/XBMCProjectM/libprojectM/fonts
-ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
-ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
@@@ -128,8 -120,8 +120,8 @@@
./bootstrap
./configure $(XBMC_CONFIG_OPTIONS)
# Add Debian related notes to XBMC's original logo
- mkdir -p $(CURDIR)/debian/tmp/home/user
- HOME=$(CURDIR)/debian/tmp/home/user gimp -i -b '(load "debian/xcf2png.scm") (xcf2png "debian/xbmc-logo.xcf" "addons/skin.confluence/media/xbmc-logo.png") (gimp-quit 0)'
+ mkdir -p $(GIMP_FAKE_HOMEDIR)
+ HOME=$(GIMP_FAKE_HOMEDIR) GIMP2_DIRECTORY=$(GIMP_FAKE_HOMEDIR)/.gimp-dir gimp -i -b '(load "debian/xcf2png.scm") (xcf2png "debian/xbmc-logo.xcf" "addons/skin.confluence/media/xbmc-logo.png") (gimp-quit 0)'
override_dh_auto_install:
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
@@@ -189,6 -181,12 +181,12 @@@ debian/tmp/xbmc-bin-recommends-dummy.so
-lvorbisfile \
$(ARCH_SPECIFIC_LIB_RECOMMENDS)
+ override_dh_strip:
+ dh_strip --dbg-package=xbmc-dbg
+
+ override_dh_installinit:
+ echo "Shipping systemd xbmc.service file as an example only"
+
# Get original XBMC source and cut not needed bits.
# Based on https://github.com/xbmc/xbmc-packaging/blob/master/xbmc-get-orig-source
ORIG_SRC_DIR := debian/tmp-src-dir
@@@ -231,7 -229,8 +229,8 @@@ get-orig-source
$(ORIG_SRC_DIR)/*/lib/groovy \
$(ORIG_SRC_DIR)/*/lib/taglib \
$(ORIG_SRC_DIR)/*/lib/win32 \
- $(ORIG_SRC_DIR)/*/addons/addons/service.xbmc.versioncheck \
+ $(ORIG_SRC_DIR)/*/project/Win32BuildSetup \
+ $(ORIG_SRC_DIR)/*/addons/service.xbmc.versioncheck \
$(ORIG_SRC_DIR)/*/addons/webinterface.default/js/iscroll-min.js \
$(ORIG_SRC_DIR)/*/addons/webinterface.default/js/jquery-1.8.2.min.js \
$(ORIG_SRC_DIR)/*/addons/skin.confluence/fonts/Roboto-*.ttf \
@@@ -251,7 -250,7 +250,7 @@@
-o -name '.*.orig' -o -name .*.rej -o -name '.SUMS' \
-o -name TAGS -o \( -path '*/.deps/*' -a -name '*.P' \) \
-o -name config.status -o -name config.cache -o -name config.log \
- \) -exec rm -f "{}" \; \) -o \
+ -o -name 'VS20*' \) -exec rm -f "{}" \; \) -o \
\( -type d -a -name autom4te.cache -prune -exec rm -rf "{}" \; \) \)
rm $(ORIG_SRC_DIR)/*/.gitignore
#Remove empty directories
--
xbmc packaging
More information about the pkg-multimedia-commits
mailing list