[SCM] xbmc/wheezy-backports: Merge tag 'debian/2%12.3+dfsg2-6' into wheezy-backports and prepare changelog
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Tue May 27 11:41:11 UTC 2014
Finalize changelog targeting unstable
Fix #include directive across installed headers
Don's set source dir for dh_install, rely on defaults instead
Ship XBMC Addon headers in xbmc-addons-dev package
Start working on next upload
Override Lintian error properly for source package
Really finalize changelog
Ignore Lintian warning about minified iScroll temporarily
Make xbmc depend on libjs-iscroll and use minified iscroll.js from it
Stop shipping minified iscroll.js
Finalize changelog targeting unstable
Use groovy.jar instead of groovy-all-1.8.6.jar to work around FTBFS
Remove Andres Mejia as uploader since he is tracked as MIA
Make package team-maintained by Debian Multimedia Maintainers
Start working on new upload
Finalize changelog
Return to using embedded libdvdnav and libdvdread
Revert "Really delete libdvdnav and libdvdread from repacked source"
Find proper libdvdnav, libsidplay2 and libhdhomerun at run time (Closes: #737545)
Fix syntax error in configure patch
Use system's libhdhomerun
Really delete libdvdnav and libdvdread from repacked source
Start working on next upload
Finalize changelog
Drop optional dependency on libtiff4-dev (Closes: #736049)
Remove outdated notes on using internal FFmpeg
Let configure run on all architectures
Start working on new upload
Finalize changelog
Build on all architectures
Don't link with libvdpau on armel and armhf
Start working on new upload
Finalize changelog
Merge tag 'upstream/12.3+dfsg2'
Imported Upstream version 12.3+dfsg2
Drop some unused embedded libraries from source
Link xbmc.bin with FTGL but leave it disabled in ProjectM plugin
Use jQuery from libjs-jquery package (Closes: #735238)
Re-create arial.ttf from DejaVuSans and DroidSansFallback (Closes: #735291)
Drop gettext as an alternative build-dependency to autopoint
Remove accidental newline
Depend on ttf-dejavu-core optionally to make xbmc more backports-friendly
Build-depend on libftgl-dev (needed by ProjectM visualization plugin)
Use sed to set DEB_VERSION instead of passing it as a C flag
Enable building on armel
Use system's libdvdread and libdvdnav
Start working on new upload
Finalize changelog
Fix build with missing lib/gtest
Use system's Roboto, Vera and LiberationSerif fonts
Fix package build breakage when screen savers are not built
Start working on next upload
Finalize changelog
Register handled MIME types based on vlc.mime (Closes: #689743)
Add Conflicts: libgl1-mesa-swx11 to xbmc-bin (Closes: #697448)
Don's ship screen savers with exec bit set (Closes: #715584, #715597, #715602)
Don's ship visualization plugins with exec bit set (Closes: #715603, #716134)
Enable libCEC again (Closes: #696463)
Add new changelog entry
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: db6df6764192a6c5f45481bb0262114fb0113097
X-Git-Newrev: c49e98a4d9a2bb9c6fdb7dcc657c2b873aaec942
The following commit has been merged in the wheezy-backports branch:
commit c49e98a4d9a2bb9c6fdb7dcc657c2b873aaec942
Merge: db6df6764192a6c5f45481bb0262114fb0113097 6afea6782f1a4bd53709c039815a9441961ad3f5
Author: Balint Reczey <balint at balintreczey.hu>
Date: Tue May 27 11:42:05 2014 +0200
Merge tag 'debian/2%12.3+dfsg2-6' into wheezy-backports and prepare changelog
xbmc Debian release 2:12.3+dfsg2-6
Conflicts:
debian/changelog
debian/control
debian/patches/series
debian/rules
diff --combined debian/changelog
index 15cd75b,bf165a5..3955426
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,89 +1,96 @@@
- xbmc (2:12.3+dfsg1-3~bpo70+2) wheezy-backports; urgency=low
++xbmc (2:12.3+dfsg2-6~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> Tue, 27 May 2014 12:15:20 +0200
++
+ xbmc (2:12.3+dfsg2-6) unstable; urgency=low
+
+ * Ship XBMC Addon headers in xbmc-addons-dev package
+ * Don's set source dir for dh_install, rely on defaults instead
+ * Fix #include directive across installed headers
+
+ -- Balint Reczey <balint at balintreczey.hu> Wed, 07 May 2014 18:38:47 +0200
+
+ xbmc (2:12.3+dfsg2-5) unstable; urgency=low
+
+ * Make package team-maintained by Debian Multimedia Maintainers.
+ Debian XBMC Packaging Team which was dysfunctional since the single
+ developer member of it is MIA since months.
+ * Remove Andres Mejia as uploader since he is tracked as MIA.
+ Thank you for maintaining the package for a long time! (Closes: #743558)
+ * Use groovy.jar instead of groovy-all-1.8.6.jar to work around FTBFS
+ (Closes: #744330)
+ * Rebuild to depend on latest librtmp (Closes: #746435)
+ * Stop shipping minified iscroll.js
+ * Make xbmc depend on libjs-iscroll and use minified iscroll.js from it
+ * Ignore Lintian warning about minified iScroll temporarily.
+ Latest xbmc package in experimental is already fixed
+
+ -- Balint Reczey <balint at balintreczey.hu> Mon, 28 Apr 2014 12:21:01 +0200
+
+ xbmc (2:12.3+dfsg2-4) unstable; urgency=low
+
+ * Use system's libhdhomerun
+ * Fix syntax error in configure patch
+ * Find proper libsidplay2 and libhdhomerun at run time
+ * Return to using embedded libdvdnav and libdvdread (Closes: #737545)
+
+ -- Balint Reczey <balint at balintreczey.hu> Sun, 19 Jan 2014 13:12:00 +0100
+
+ xbmc (2:12.3+dfsg2-3) unstable; urgency=low
+
+ * Let configure run on all architectures
+ * Remove outdated notes on using internal FFmpeg
* Don't let Gimp use real home directory
+ * Drop optional dependency on libtiff4-dev (Closes: #736049)
- -- Balint Reczey <balint at balintreczey.hu> Sun, 19 Jan 2014 02:32:07 +0100
+ -- Balint Reczey <balint at balintreczey.hu> Sat, 18 Jan 2014 02:13:21 +0100
- xbmc (2:12.3+dfsg1-3~bpo70+1) wheezy-backports; urgency=low
+ xbmc (2:12.3+dfsg2-2) unstable; urgency=low
- * Rebuild for wheezy-backports.
+ * Don't link with libvdpau on armel and armhf
+ * Build on all architectures
+
+ -- Balint Reczey <balint at balintreczey.hu> Fri, 17 Jan 2014 11:21:29 +0100
+
+ xbmc (2:12.3+dfsg2-1) unstable; urgency=low
+
+ * Use system's libdvdread and libdvdnav
+ * Enable building on armel
* Use sed to set DEB_VERSION instead of passing it as a C flag
* Build-depend on libftgl-dev (needed by ProjectM visualization plugin)
- * Disable FTGL usage in ProjectM visualization plugin
- (libftgl-dev is still needed for CMake)
* Depend on ttf-dejavu-core optionally to make xbmc more backports-friendly
+ * Remove accidental newline
* Drop gettext as an alternative build-dependency to autopoint
+ * Re-create arial.ttf from DejaVuSans and DroidSansFallback (Closes: #735291)
+ * Use jQuery from libjs-jquery package (Closes: #735238)
+ * Link xbmc.bin with FTGL but leave it disabled in ProjectM plugin
+ * Drop some unused embedded libraries from source
+ * Repack source as 12.3+dfsg2
+
+ -- Balint Reczey <balint at balintreczey.hu> Sat, 11 Jan 2014 15:19:45 +0100
+
+ xbmc (2:12.3+dfsg1-5) unstable; urgency=low
+
+ * Fix package build breakage when screen savers are not built
+ * Use system's Roboto, Vera and LiberationSerif fonts
+ * Fix build with missing lib/gtest
+
+ -- Balint Reczey <balint at balintreczey.hu> Sat, 11 Jan 2014 01:56:38 +0100
+
+ xbmc (2:12.3+dfsg1-4) unstable; urgency=low
+
+ * Enable libCEC again (Closes: #696463)
+ * Don's ship visualization plugins with exec bit set
+ (Closes: #715603, #716134)
+ * Don's ship screen savers with exec bit set
+ (Closes: #715584, #715597, #715602)
+ * Add Conflicts: libgl1-mesa-swx11 to xbmc-bin (Closes: #697448)
+ * Register handled MIME types based on vlc.mime (Closes: #689743)
- -- Balint Reczey <balint at balintreczey.hu> Tue, 14 Jan 2014 17:33:24 +0100
+ -- Balint Reczey <balint at balintreczey.hu> Thu, 09 Jan 2014 16:04:07 +0100
xbmc (2:12.3+dfsg1-3) unstable; urgency=low
diff --combined debian/control
index 7cc3892,c27daa2..c91ae0e
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,8 +1,8 @@@
Source: xbmc
Section: video
Priority: optional
- Maintainer: Debian XBMC Packaging Team <pkg-xbmc-maintainers at lists.alioth.debian.org>
- Uploaders: Andres Mejia <amejia at debian.org>, Balint Reczey <balint at balintreczey.hu>
+ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+ Uploaders: Balint Reczey <balint at balintreczey.hu>
Build-Depends: debhelper (>= 7.0.50~),
python-support,
cmake,
@@@ -62,7 -62,7 +62,7 @@@
libsmbclient-dev,
libiso9660-dev,
libssl-dev,
- libvdpau-dev,
+ libvdpau-dev [!armel !armhf],
libmicrohttpd-dev,
libmodplug-dev,
librtmp-dev,
@@@ -79,7 -79,7 +79,7 @@@
libshairport-dev,
libnfs-dev,
libltdl-dev,
- libtiff4-dev | libtiff-dev,
+ libtiff-dev,
libtinyxml-dev (>= 2.6.2),
libmp3lame-dev,
libssh-dev,
@@@ -87,7 -87,7 +87,7 @@@
swig,
default-jre,
libbluray-dev,
- libva-dev,
+ libva-dev [!armel !armhf],
libavcodec-dev,
libavfilter-dev,
libavformat-dev,
@@@ -100,11 -100,18 +100,18 @@@
libcommons-lang-java,
doxygen,
libcap-dev,
- libsidplay2-dev
+ libsidplay2-dev,
+ libdvdnav-dev,
+ libdvdread-dev,
+ libhdhomerun-dev,
+ fontforge,
- fonts-dejavu-core,
++ ttf-dejavu-core,
+ fonts-droid,
+ ttf-bitstream-vera
Standards-Version: 3.9.3
Homepage: http://xbmc.org/
- Vcs-Git: git://git.debian.org/collab-maint/pkg-xbmc.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/pkg-xbmc.git
+ Vcs-Git: git://git.debian.org/pkg-multimedia/xbmc.git
+ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xbmc.git
Package: xbmc
Architecture: all
@@@ -112,8 -119,10 +119,10 @@@ Depends: xbmc-bin (>= ${source:Version}
xbmc-bin (<< ${source:Version}.1~),
mesa-utils,
x11-utils,
- fonts-liberation,
fonts-dejavu-core | ttf-dejavu-core,
+ fonts-roboto,
+ libjs-jquery,
+ libjs-iscroll,
python-imaging,
${python:Depends},
${misc:Depends}
@@@ -144,14 -153,14 +153,14 @@@ Description: XBMC Media Center (arch-in
working XBMC.
Package: xbmc-bin
- Architecture: i386 amd64 armhf
+ Architecture: any
Depends: ${shlibs:Depends},
${dlopenlibs:Depends},
${misc:Depends}
Recommends: ${shlibs:Recommends}
Provides: xbmc-common
Replaces: xbmc-common
- Conflicts: xbmc-common
+ Conflicts: xbmc-common, libgl1-mesa-swx11
Description: XBMC Media Center (binary data 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
@@@ -221,7 -230,7 +230,7 @@@ Description: XBMC Media Center (Event C
This is the Development package for XBMC Event Client.
Package: xbmc-eventclients-wiiremote
- Architecture: i386 amd64 armhf
+ Architecture: any
Depends: xbmc-eventclients-common (= ${source:Version}),
${shlibs:Depends},
${misc:Depends}
@@@ -323,3 -332,30 +332,30 @@@ Description: XBMC Media Center (Event C
.
This package is the XBMC-SEND package for XBMC Event Client.
+ Package: xbmc-addons-dev
+ Architecture: all
+ Section: libdevel
+ Depends: ${misc:Depends}
+ Description: XBMC Media Center (Addons Dev 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 is the development package for XBMC Addons.
+ .
+ This package contains independent headers for building Addons
+ without the whole XBMC source tree.
+
diff --combined debian/rules
index 562fc3d,cb4e3ee..b666541
--- a/debian/rules
+++ b/debian/rules
@@@ -33,6 -33,7 +33,7 @@@ endi
# 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
else
GL_CONFIG_OPTIONS = --disable-gl --enable-gles --disable-vdpau \
--disable-vaapi
@@@ -43,7 -44,7 +44,7 @@@ DEB_CFLAGS ?= $(shell dpkg-buildflags
$(filter-out -g -O2, $(shell dpkg-buildflags --get CFLAGS))
DEB_CXXFLAGS ?= $(shell dpkg-buildflags --get CPPFLAGS) \
$(filter-out -g -O2, $(shell dpkg-buildflags --get CXXFLAGS))
- DEB_LDFLAGS ?= $(shell dpkg-buildflags --get LDFLAGS)
+ DEB_LDFLAGS ?= $(shell dpkg-buildflags --get LDFLAGS) $(shell pkg-config --libs ftgl)
ENV_OPTIONS = CFLAGS="$(DEB_CFLAGS)" CXXFLAGS="$(DEB_CXXFLAGS)" \
LDFLAGS="$(DEB_LDFLAGS)"
@@@ -81,6 -82,7 +82,7 @@@ XBMC_CONFIG_OPTIONS ?= --host=$(DEB_HOS
--disable-dependency-tracking \
--disable-dvdcss \
--disable-non-free \
+ --disable-gtest \
$(ARCH_SPECIFIC_OPTIONS) \
$(XBMC_CONFIG_EXTRA_OPTIONS) \
$(ENV_OPTIONS)
@@@ -102,30 -104,46 +104,47 @@@ 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
override_dh_auto_configure: configure
sed -i 's/DEB_VERSION/"'$(VERSION)'"/' xbmc/GUIInfoManager.cpp
+ 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/
+ fontforge -script $(CURDIR)/debian/mergefonts.ff \
+ /usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf \
- /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf \
++ /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf \
+ $(CURDIR)/media/Fonts/arial.ttf
./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) -C lib/addons/script.module.pil
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) eventclients DESTDIR=$(CURDIR)/debian/tmp \
WII_EXTRA_OPTS=-DCWIID_OLD
+ mkdir -p $(CURDIR)/debian/tmp/usr/include/xbmc
+ sed 's|../library.xbmc.addon/|xbmc/|' addons/library.xbmc.gui/libXBMC_gui.h > \
+ $(CURDIR)/debian/tmp/usr/include/xbmc/libXBMC_gui.h
+ sed 's|../library.xbmc.addon/|xbmc/|' addons/library.xbmc.pvr/libXBMC_pvr.h > \
+ $(CURDIR)/debian/tmp/usr/include/xbmc/libXBMC_pvr.h
override_dh_install:
- dh_install --sourcedir=$(CURDIR)/debian/tmp -XLICENCE \
+ dh_install -XLICENCE \
-XLicence.txt -XLicense.txt -XLiberationSans-Regular.ttf \
- -XDejaVuSans.ttf -XDejaVuSans-Bold.ttf -XLICENSE.txt
+ -XDejaVuSans.ttf -XDejaVuSans-Bold.ttf -XLICENSE.txt \
+ -XRoboto-Bold.ttf -XRoboto-Regular.ttf -XNOTICE.txt \
+ -Xjquery-1.8.2.min.js -Xiscroll-min.js
override_dh_makeshlibs:
# We don't install shared libraries in standard locations so don't run
# dh_makeshlibs
+ # OTOH we need to remove exec flag after dh_strip
+ chmod -x $(CURDIR)/debian/tmp/usr/lib/xbmc/addons/visualization.*/*.vis
+ -chmod -x $(CURDIR)/debian/tmp/usr/lib/xbmc/addons/screensaver.rsxs.*/*.xbs
override_dh_shlibdeps: debian/tmp/xbmc-bin-depends-dummy.so debian/tmp/xbmc-bin-recommends-dummy.so
dh_shlibdeps -a -O--parallel \
@@@ -146,6 -164,7 +165,7 @@@ debian/tmp/xbmc-bin-recommends-dummy.so
-lbluray \
-lcec \
-lFLAC \
+ -lhdhomerun \
-lmad \
-lmodplug \
-lmp3lame \
@@@ -155,7 -174,6 +175,6 @@@
-lplist \
-lrtmp \
-lshairport \
- -lvdpau \
-lvorbis \
-lvorbisenc \
-lvorbisfile \
@@@ -177,11 -195,20 +196,20 @@@ get-orig-source
# Remove components not needed for Linux
rm -rf $(ORIG_SRC_DIR)/*/lib/afpfs-ng \
$(ORIG_SRC_DIR)/*/lib/enca \
+ $(ORIG_SRC_DIR)/*/lib/cximage-6.0/jasper \
+ $(ORIG_SRC_DIR)/*/lib/cximage-6.0/jbig \
+ $(ORIG_SRC_DIR)/*/lib/cximage-6.0/jpeg \
+ $(ORIG_SRC_DIR)/*/lib/cximage-6.0/mng \
+ $(ORIG_SRC_DIR)/*/lib/cximage-6.0/png \
+ $(ORIG_SRC_DIR)/*/lib/cximage-6.0/tiff \
+ $(ORIG_SRC_DIR)/*/lib/cximage-6.0/zlib \
$(ORIG_SRC_DIR)/*/lib/freetype \
$(ORIG_SRC_DIR)/*/lib/gtest \
+ $(ORIG_SRC_DIR)/*/lib/libUPnP/Neptune/ThirdParty/zlib-1.2.3 \
$(ORIG_SRC_DIR)/*/lib/libass \
$(ORIG_SRC_DIR)/*/lib/libbluray \
$(ORIG_SRC_DIR)/*/lib/libcec \
+ $(ORIG_SRC_DIR)/*/lib/libhdhomerun \
$(ORIG_SRC_DIR)/*/lib/liblame \
$(ORIG_SRC_DIR)/*/lib/libmad \
$(ORIG_SRC_DIR)/*/lib/libmicrohttpd \
@@@ -193,7 -220,12 +221,12 @@@
$(ORIG_SRC_DIR)/*/lib/libsidplay2 \
$(ORIG_SRC_DIR)/*/lib/groovy \
$(ORIG_SRC_DIR)/*/lib/taglib \
- $(ORIG_SRC_DIR)/*/lib/win32
+ $(ORIG_SRC_DIR)/*/lib/win32 \
+ $(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 \
+ $(ORIG_SRC_DIR)/*/media/Fonts/arial.ttf \
+ $(ORIG_SRC_DIR)/*/xbmc/visualizations/XBMCProjectM/libprojectM/fonts/Vera*.ttf
find $(ORIG_SRC_DIR)/* -depth \( \( -iname '*.so' -o -iname '*.exe' -o -iname '*.lib' \
-o -iname '*.dll' -o -iname '*.dylib' -o -iname '*.a' -o -iname '*.obj' \
\) -exec rm -rf "{}" \; \)
--
xbmc packaging
More information about the pkg-multimedia-commits
mailing list