[SCM] vlc/squeeze-backports: Merge branch 'master' into squeeze-backports
edwardw-guest at users.alioth.debian.org
edwardw-guest at users.alioth.debian.org
Wed Aug 8 02:14:57 UTC 2012
Release 2.0.3-1 to Debian unstable.
Merge tag 'upstream/2.0.3'
Imported Upstream version 2.0.3
Release 2.0.2-2 to Debian unstable.
ttf-freefont was renamed to fonts-freefont-ttf.
Drop libggi2-dev from build dependencies (not needed any more).
Add missing epoch to libqt4-dev build dependency.
Release 2.0.2-1 to Debian unstable.
Add libfbosd plugin to vlc-nox on Linux.
Add missing build dependency on libiso9660-dev.
Add libomxil to vlc-nox on Linux.
Switch to debhelper 8.
Disable NEON on armel.
Close Debian bugs.
Add libdirectfb plugin to vlc-nox.
crystalhd is only available on amd64 and i386.
update debian/changelog
Build depend on libcrystalhd-dev and enable the crystalhd plugin.
Add new symbols to libvlccore5.
Breaks and Replaces are needed for a file movement.
Release 2.0.2-1 to Debian unstable.
Use Replaces for smooth upgrade to 2.0.2, due to file changes
Revert "Release 2.0.2-1 to Debian unstable."
Release 2.0.2-1 to Debian unstable.
libcaca_plugin.so depends on X11
Add crystalhd plugin to VLC dist
Revert "Release 2.0.2-1 to Debian unstable."
Release 2.0.2-1 to Debian unstable.
Merge commit 'upstream/2.0.2'
Imported Upstream version 2.0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/squeeze-backports
X-Git-Reftype: branch
X-Git-Oldrev: 8aeb075f428fdf1f482602a92692d2b5a4d7f3d3
X-Git-Newrev: a0aadbae70dd72ece82ecd93f6a0aa3b5c136ffe
The following commit has been merged in the squeeze-backports branch:
commit 1e519d09edd9a727b50ce6861427f26d7bc9eca9
Merge: 8aeb075f428fdf1f482602a92692d2b5a4d7f3d3 29b6fb5108949fc9d16f6108204447c4e4149054
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date: Tue Aug 7 15:52:28 2012 -0400
Merge branch 'master' into squeeze-backports
Conflicts:
debian/changelog
diff --combined debian/changelog
index cb5194f,25b7329..c30c52d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,43 +1,51 @@@
+ vlc (2.0.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Benjamin Drung <bdrung at debian.org> Sat, 21 Jul 2012 17:52:21 +0200
+
+ vlc (2.0.2-2) unstable; urgency=low
+
+ * Add missing epoch to libqt4-dev build dependency.
+ * Drop libggi2-dev from build dependencies (not needed any more).
+ (Closes: #680237)
+ * The dependency ttf-freefont was renamed to fonts-freefont-ttf.
+
+ -- Benjamin Drung <bdrung at debian.org> Sat, 07 Jul 2012 19:13:07 +0200
+
+ vlc (2.0.2-1) unstable; urgency=medium
+
+ [ Edward Wang ]
+ * New upstream release (Closes: #679625, #664279, LP: #689122, #936488,
+ #942126, #971106, #972615, #973051, #987231, #995003, #998538).
+ - Fix Ogg Heap buffer overflow. Thanks to Hugo Beauzée-Luyssen
+ * Add the crystalhd plugin to the vlc distribution.
+ * libcaca_plugin.so now depends on X11 in this release, so it must
+ be installed under vlc (versus vlc-nox).
+
+ [ Reinhard Tartler ]
+ * Urgency set to medium because a security issue is fixed in this release
+
+ [ Benjamin Drung ]
+ * Add new plugins to vlc-nox:
+ - crystalhd (Linux amd64 and i386 only)
+ - directfb
+ - fbosd (Linux only)
+ - omxil (Linux only)
+ * Add build dependencies for new plugins.
+ * Add new symbols to libvlccore5.
+ * Switch to debhelper 8.
+
+ -- Benjamin Drung <bdrung at debian.org> Sat, 30 Jun 2012 18:39:41 +0200
+
+vlc (2.0.1-4~bpo60+1) squeeze-backports; urgency=low
+
+ * Rebuild for squeeze-backports.
+ * Disable dirac support as libschroedinger is too old in squeeze. It
+ will be re-enabled as soon as an updated package reaches squeeze-backports
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 19 May 2012 19:47:34 +0200
+
vlc (2.0.1-4) unstable; urgency=high
* Add missing Breaks and Replaces for moving the documentation from vlc-data
diff --combined debian/control
index bd62ef7,e7e8be9..7b050b2
--- a/debian/control
+++ b/debian/control
@@@ -10,7 -10,7 +10,7 @@@ Uploaders: Sam Hocevar (Debian packages
Reinhard Tartler <siretart at tauware.de>,
Benjamin Drung <bdrung at debian.org>
Build-Depends: autopoint,
- debhelper (>= 7.2.3~),
+ debhelper (>= 8),
dh-autoreconf,
dh-buildinfo,
gettext,
@@@ -26,9 -26,11 +26,11 @@@
libcaca-dev (>= 0.99.beta4),
libcddb2-dev,
libcdio-dev (>= 0.78.2),
+ libcrystalhd-dev [amd64 i386],
libdc1394-22-dev (>= 2.1.0) [linux-any],
libdca-dev,
libdirac-dev,
+ libdirectfb-dev,
libdvbpsi-dev | libdvbpsi5-dev,
libdvdnav-dev,
libdvdread-dev (>= 0.9.5),
@@@ -37,11 -39,11 +39,11 @@@
libfluidsynth-dev,
libfreetype6-dev,
libfribidi-dev,
- libggi2-dev,
libgl1-mesa-dev,
libglib2.0-0,
libgnutls-dev (>= 2.0.0),
libgtk2.0-dev,
+ libiso9660-dev (>= 0.72),
libjack-dev,
libkate-dev (>= 0.3.0),
liblircclient-dev,
@@@ -56,15 -58,17 +58,16 @@@
libncursesw5-dev,
libnotify-dev,
libogg-dev (>= 1.0),
+ libomxil-bellagio-dev [linux-any],
libpng-dev,
libpostproc-dev (>= 4:0.6),
libproxy-dev,
libpulse-dev (>= 0.9.11),
- libqt4-dev (>= 4.6.0),
+ libqt4-dev (>= 4:4.6.0),
libraw1394-dev (>= 2.0.1) [linux-any],
libresid-builder-dev,
librsvg2-dev,
libsamplerate0-dev,
- libschroedinger-dev (>= 1.0.10),
libsdl-image1.2-dev,
libsdl1.2-dev (>= 1.2.10),
libshout3-dev,
@@@ -161,7 -165,7 +164,7 @@@ Description: base library for VLC and i
Package: vlc
Architecture: any
- Depends: ttf-freefont,
+ Depends: fonts-freefont-ttf | ttf-freefont,
vlc-nox (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@@ -169,8 -173,8 +172,8 @@@ Recommends: vlc-plugin-notify (= ${bina
vlc-plugin-pulse (= ${binary:Version}),
xdg-utils
Suggests: videolan-doc
- Breaks: vlc-data (<< 1.1.5), vlc-nox (<< 1.1.5)
- Replaces: vlc-data (<< 1.1.5), vlc-nox (<< 1.1.5)
+ Breaks: vlc-data (<< 1.1.5), vlc-nox (<< 2.0.2)
+ Replaces: vlc-data (<< 1.1.5), vlc-nox (<< 2.0.2)
Provides: mp3-decoder
Description: multimedia player and streamer
VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
diff --combined debian/rules
index 2816082,c605f1c..60fc1ca
--- a/debian/rules
+++ b/debian/rules
@@@ -3,6 -3,7 +3,7 @@@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
VERSION = $(shell dpkg-parsechangelog|sed -n 's/^Version: //p')
DEBIAN_VERSION = $(shell echo $(VERSION)|sed -nr 's/[^:]+://; s/.*-([^-]+$$)/\1/p')
@@@ -47,6 -48,7 +48,7 @@@ confflags +=
--enable-dbus \
--enable-dca \
--enable-dirac \
+ --enable-directfb \
--enable-dvbpsi \
--enable-dvdnav \
--enable-faad \
@@@ -77,6 -79,7 +79,6 @@@
--enable-qt4 \
--enable-realrtsp \
--enable-samplerate \
- --enable-schroedinger \
--enable-sdl \
--enable-shout \
--enable-skins2 \
@@@ -114,24 -117,86 +116,86 @@@ confflags +=
# Linux specific flags
ifeq ($(DEB_HOST_ARCH_OS),linux)
+ # omxil should be enabled on all systems, but libomxil-bellagio does
+ # not build on kfreebsd and hurd (currently)
confflags += \
--enable-alsa \
--enable-atmo \
--enable-dc1394 \
--enable-dv \
+ --enable-fbosd \
--enable-libva \
--enable-linsys \
+ --enable-omxil \
--enable-pvr \
--enable-udev \
- --enable-v4l2 \
$(NULL)
- endif
-
- ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+ else
confflags += \
--disable-alsa \
- --enable-v4l2 \
+ --disable-atmo \
+ --disable-dc1394 \
+ --disable-dv \
+ --disable-fbosd \
+ --disable-libva \
+ --disable-linsys \
+ --disable-omxil \
+ --disable-pvr \
+ --disable-udev \
$(NULL)
+ removeplugins += \
+ alsa \
+ libatmo \
+ libdc1394 \
+ libdtv \
+ libaccess_dv \
+ libfb \
+ libfbosd \
+ libomxil \
+ linsys \
+ libpvr \
+ libudev \
+ $(NULL)
+ endif
+
+ # Linux and kFreeBSD specific flags
+ ifneq ($(filter $(DEB_HOST_ARCH_OS),linux kfreebsd),)
+ confflags += --enable-v4l2
+ else
+ confflags += --disable-v4l2
+ removeplugins += libv4l2
+ endif
+
+ # Linux amd64 and i386 specific flags
+ ifneq ($(filter $(DEB_HOST_ARCH),amd64 i386),)
+ confflags += --enable-crystalhd
+ else
+ confflags += --disable-crystalhd
+ removeplugins += libcrystalhd
+ endif
+
+ # amd64 and i386 specific optimizations
+ ifneq ($(filter $(DEB_HOST_ARCH_CPU),amd64 i386),)
+ confflags += --enable-mmx --enable-sse
+ else
+ confflags += --disable-mmx --disable-sse
+ removeplugins += 3dn mmx mmxext sse2
+ endif
+
+ # ARM specific optimizations
+ ifneq ($(filter $(DEB_HOST_ARCH_CPU),armhf),)
+ confflags += --enable-neon
+ else
+ confflags += --disable-neon
+ removeplugins += neon
+ endif
+
+ # PowerPC specific optimizations
+ ifneq ($(filter $(DEB_HOST_ARCH_CPU),powerpc),)
+ confflags += --enable-altivec
+ else
+ confflags += --disable-altivec
+ removeplugins += altivec
endif
%:
@@@ -141,10 -206,7 +205,7 @@@ override_dh_autoreconf
dh_autoreconf --as-needed
override_dh_auto_clean:
- [ ! -f debian/vlc-nox.install.bak ] || mv -f debian/vlc-nox.install.bak \
- debian/vlc-nox.install
- rm -f debian/vlc-nox.install.kfreebsd
- rm -f debian/vlc-nox.install.hurd
+ [ ! -f debian/vlc-nox.install.bak ] || mv -f debian/vlc-nox.install.bak debian/vlc-nox.install
rm -rf tmp/
dh_auto_clean
@@@ -175,17 -237,9 +236,9 @@@ endi
endif
override_dh_install:
- cp debian/vlc-nox.install debian/vlc-nox.install.bak
- for dir in sse2 3dnow altivec arm_neon mmx mmxext ; do \
- if test -d debian/tmp/usr/lib/vlc/plugins/$${dir}; then \
- echo usr/lib/vlc/plugins/$${dir} >> debian/vlc-nox.install ; \
- fi ; \
- done
- # Remove some modules on non-linux arch
- sed -e '/\(lib\|libaccess_\)\(alsa\|atmo\|dc1394\|dtv\|dv\|fb\|pvr\|udev\)_/d;/liblinsys_/d' \
- debian/vlc-nox.install > debian/vlc-nox.install.kfreebsd
- sed -e '/\(lib\|libaccess_\)v4l2_/d' \
- debian/vlc-nox.install.kfreebsd > debian/vlc-nox.install.hurd
+ # Remove disabled plugins
+ test -f debian/vlc-nox.install.bak || cp debian/vlc-nox.install debian/vlc-nox.install.bak
+ sed -i "/\($(shell echo $(removeplugins) | sed 's/ /\\|/g')\)_/d" debian/vlc-nox.install
cp tmp/libvlc.a debian/tmp/usr/lib
cp tmp/libvlccore.a debian/tmp/usr/lib
# Clean up libtool crap
@@@ -232,3 -286,6 +285,6 @@@ override_dh_installdocs
override_dh_installchangelogs:
dh_installchangelogs ChangeLog -p vlc-data
dh_installchangelogs ChangeLog -p vlc-nox
+
+ override_dh_builddeb:
+ dh_builddeb -- -Zxz
diff --combined debian/vlc-nox.install
index 39bbf38,7d6f635..68ecff4
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@@ -4,6 -4,7 +4,7 @@@ usr/bin/rvl
usr/bin/vlc
usr/bin/vlc-wrapper
usr/lib/vlc/lua/
+ usr/lib/vlc/plugins/3dnow/libmemcpy3dn_plugin.so
usr/lib/vlc/plugins/access/libaccess_alsa_plugin.so
usr/lib/vlc/plugins/access/libaccess_attachment_plugin.so
usr/lib/vlc/plugins/access/libaccess_avio_plugin.so
@@@ -41,6 -42,11 +42,11 @@@ usr/lib/vlc/plugins/access/libvcd_plugi
usr/lib/vlc/plugins/access/libvcdx_plugin.so
usr/lib/vlc/plugins/access/libzip_plugin.so
usr/lib/vlc/plugins/access_output
+ usr/lib/vlc/plugins/altivec/libi420_yuy2_altivec_plugin.so
+ usr/lib/vlc/plugins/altivec/libmemcpyaltivec_plugin.so
+ usr/lib/vlc/plugins/arm_neon/libaudio_format_neon_plugin.so
+ usr/lib/vlc/plugins/arm_neon/libchroma_yuv_neon_plugin.so
+ usr/lib/vlc/plugins/arm_neon/libyuv_rgb_neon_plugin.so
usr/lib/vlc/plugins/audio_filter
usr/lib/vlc/plugins/audio_mixer
usr/lib/vlc/plugins/audio_output/libadummy_plugin.so
@@@ -54,6 -60,7 +60,7 @@@ usr/lib/vlc/plugins/codec/libaes3_plugi
usr/lib/vlc/plugins/codec/libaraw_plugin.so
usr/lib/vlc/plugins/codec/libcc_plugin.so
usr/lib/vlc/plugins/codec/libcdg_plugin.so
+ usr/lib/vlc/plugins/codec/libcrystalhd_plugin.so
usr/lib/vlc/plugins/codec/libcvdsub_plugin.so
usr/lib/vlc/plugins/codec/libddummy_plugin.so
usr/lib/vlc/plugins/codec/libdirac_plugin.so
@@@ -67,8 -74,10 +74,9 @@@ usr/lib/vlc/plugins/codec/liblibass_plu
usr/lib/vlc/plugins/codec/liblibmpeg2_plugin.so
usr/lib/vlc/plugins/codec/liblpcm_plugin.so
usr/lib/vlc/plugins/codec/libmpeg_audio_plugin.so
+ usr/lib/vlc/plugins/codec/libomxil_plugin.so
usr/lib/vlc/plugins/codec/libpng_plugin.so
usr/lib/vlc/plugins/codec/librawvideo_plugin.so
-usr/lib/vlc/plugins/codec/libschroedinger_plugin.so
usr/lib/vlc/plugins/codec/libspeex_plugin.so
usr/lib/vlc/plugins/codec/libspudec_plugin.so
usr/lib/vlc/plugins/codec/libstl_plugin.so
@@@ -89,6 -98,7 +97,7 @@@ usr/lib/vlc/plugins/control/libmotion_p
usr/lib/vlc/plugins/control/libnetsync_plugin.so
usr/lib/vlc/plugins/control/liboldrc_plugin.so
usr/lib/vlc/plugins/demux
+ usr/lib/vlc/plugins/gui/libfbosd_plugin.so
usr/lib/vlc/plugins/gui/libncurses_plugin.so
usr/lib/vlc/plugins/lua/liblua_plugin.so
usr/lib/vlc/plugins/meta_engine
@@@ -102,6 -112,11 +111,11 @@@ usr/lib/vlc/plugins/misc/libosd_parser_
usr/lib/vlc/plugins/misc/libstats_plugin.so
usr/lib/vlc/plugins/misc/libvod_rtsp_plugin.so
usr/lib/vlc/plugins/misc/libxml_plugin.so
+ usr/lib/vlc/plugins/mmx/libi420_rgb_mmx_plugin.so
+ usr/lib/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.so
+ usr/lib/vlc/plugins/mmx/libi422_yuy2_mmx_plugin.so
+ usr/lib/vlc/plugins/mmx/libmemcpymmx_plugin.so
+ usr/lib/vlc/plugins/mmxext/libmemcpymmxext_plugin.so
usr/lib/vlc/plugins/mux
usr/lib/vlc/plugins/notify/libtelepathy_plugin.so
usr/lib/vlc/plugins/packetizer
@@@ -113,6 -128,9 +127,9 @@@ usr/lib/vlc/plugins/services_discovery/
usr/lib/vlc/plugins/services_discovery/libsap_plugin.so
usr/lib/vlc/plugins/services_discovery/libudev_plugin.so
usr/lib/vlc/plugins/services_discovery/libupnp_plugin.so
+ usr/lib/vlc/plugins/sse2/libi420_rgb_sse2_plugin.so
+ usr/lib/vlc/plugins/sse2/libi420_yuy2_sse2_plugin.so
+ usr/lib/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.so
usr/lib/vlc/plugins/stream_filter
usr/lib/vlc/plugins/stream_out
usr/lib/vlc/plugins/text_renderer/libfreetype_plugin.so
@@@ -168,7 -186,7 +185,7 @@@ usr/lib/vlc/plugins/video_filter/libtra
usr/lib/vlc/plugins/video_filter/libwall_plugin.so
usr/lib/vlc/plugins/video_filter/libwave_plugin.so
usr/lib/vlc/plugins/video_filter/libyuvp_plugin.so
- usr/lib/vlc/plugins/video_output/libcaca_plugin.so
+ usr/lib/vlc/plugins/video_output/libdirectfb_plugin.so
usr/lib/vlc/plugins/video_output/libfb_plugin.so
usr/lib/vlc/plugins/video_output/libvdummy_plugin.so
usr/lib/vlc/plugins/video_output/libvmem_plugin.so
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list