[SCM] vlc/squeeze-backports: Merge branch 'master' into squeeze-backports
edwardw-guest at users.alioth.debian.org
edwardw-guest at users.alioth.debian.org
Tue Oct 16 03:16:01 UTC 2012
Update debian/changelog.
Enable and build Opus plugin and add it to vlc-nox.
Enable and build sftp plugin and add it to vlc-nox.
Update debian/changelog.
Drop backported bp-fix-hang-caused-by-notify.patch.
Merge tag 'upstream/2.0.4'
Imported Upstream version 2.0.4
Release 2.0.3-3 to Debian unstable.
Cherry-pick fix for VLC hang caused by the notify plugin.
debian/vlc.postinst: Fix directory to symlink upgrade in postinst.
Revert "Enable and build sftp plugin and add it to vlc-nox."
Drop alternative dependency on transitional ttf-freefont.
Enable and build sftp plugin and add it to vlc-nox.
Release 2.0.3-2 to Debian unstable.
Add bug number to Lintian override.
Add Pre-Depends on dpkg (>= 1.15.6~) for xz compression.
Add version to vlc-nox dependency of vlc-plugin-sdl (consistent with other plug-ins).
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: 0fa96e3e4c53be34f195813026d10f60a681f900
X-Git-Newrev: 1fa5d062361ceb5d77b7414a62e0ec0bdd33ab1c
The following commit has been merged in the squeeze-backports branch:
commit 3ea2cb0ab6eb147c8bcda04a03775706e9582336
Merge: 0fa96e3e4c53be34f195813026d10f60a681f900 6d9b2a281f232be2b4df4d7ed23d135a4feb1791
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date: Mon Oct 15 19:29:32 2012 -0400
Merge branch 'master' into squeeze-backports
Conflicts:
debian/changelog
debian/control
diff --combined debian/control
index bca1fe3,3b0d1f6..80ece09
--- a/debian/control
+++ b/debian/control
@@@ -26,6 -26,7 +26,6 @@@ Build-Depends: autopoint
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,
@@@ -57,6 -58,8 +57,6 @@@
libncursesw5-dev,
libnotify-dev,
libogg-dev (>= 1.0),
- libomxil-bellagio-dev [linux-any],
- libopus-dev,
libpng-dev,
libpostproc-dev (>= 4:0.6),
libproxy-dev,
@@@ -66,6 -69,7 +66,6 @@@
libresid-builder-dev,
librsvg2-dev,
libsamplerate0-dev,
- libschroedinger-dev (>= 1.0.10),
libsdl-image1.2-dev,
libsdl1.2-dev (>= 1.2.10),
libshout3-dev,
@@@ -73,6 -77,7 +73,7 @@@
libsmbclient-dev,
libspeex-dev (>= 1.0.5),
libspeexdsp-dev (>= 1.0.5),
+ libssh2-1-dev,
libsvga1-dev [amd64 i386],
libswscale-dev (>= 4:0.6),
libtag1-dev (>= 1.5),
@@@ -111,6 -116,7 +112,7 @@@ Vcs-Browser: http://git.debian.org/?p=p
Package: libvlc-dev
Section: libdevel
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: libvlc5 (= ${binary:Version}),
libvlccore-dev,
pkg-config,
@@@ -127,6 -133,7 +129,7 @@@ Description: development files for libv
Package: libvlc5
Section: libs
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: vlc (<< 0.8.6.c-6)
Description: multimedia player and streamer library
@@@ -140,6 -147,7 +143,7 @@@
Package: libvlccore-dev
Section: libdevel
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: libvlccore5 (= ${binary:Version}), pkg-config, ${misc:Depends}
Description: development files for libvlccore
This package contains headers and a static library required to build plugins
@@@ -152,6 -160,7 +156,7 @@@
Package: libvlccore5
Section: libs
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: base library for VLC and its modules
This package contains the shared library required by VLC modules and libvlc.
@@@ -162,7 -171,8 +167,8 @@@
Package: vlc
Architecture: any
- Depends: fonts-freefont-ttf | ttf-freefont,
+ Pre-Depends: dpkg (>= 1.15.6~)
+ Depends: fonts-freefont-ttf,
vlc-nox (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@@ -189,6 -199,7 +195,7 @@@ Description: multimedia player and stre
or video plugins (vlc-plugin-sdl).
Package: vlc-data
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${misc:Depends}
Architecture: all
Breaks: vlc-nox (<< 2.0.1-3)
@@@ -206,6 -217,7 +213,7 @@@ Package: vlc-db
Section: debug
Priority: extra
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}
Description: debugging symbols for vlc
VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@@ -216,6 -228,7 +224,7 @@@
Package: vlc-nox
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: vlc (<< 1.1.0)
Provides: mp3-decoder
@@@ -239,6 -252,7 +248,7 @@@ Description: multimedia player and stre
Package: vlc-plugin-fluidsynth
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: fluid-soundfont-gm | musescore-soundfont-gm,
vlc-nox (= ${binary:Version}),
${misc:Depends},
@@@ -253,6 -267,7 +263,7 @@@ Description: FluidSynth plugin for VL
Package: vlc-plugin-jack
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Jack audio plugins for VLC
These plugins add support for JACK to the VLC media player. To
@@@ -266,6 -281,7 +277,7 @@@
Package: vlc-plugin-notify
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Breaks: vlc-nox (<< 1.1.2)
Replaces: vlc-nox (<< 1.1.2)
@@@ -279,6 -295,7 +291,7 @@@ Description: LibNotify plugin for VL
Package: vlc-plugin-pulse
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: PulseAudio plugin for VLC
This plugin adds support for PulseAudio to the VLC media player. To
@@@ -291,7 -308,8 +304,8 @@@
Package: vlc-plugin-sdl
Architecture: any
- Depends: vlc-nox, ${misc:Depends}, ${shlibs:Depends}
+ Pre-Depends: dpkg (>= 1.15.6~)
+ Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: SDL video and audio output plugin for VLC
This plugin adds support for the Simple DirectMedia Layer library to
the VLC media player. To activate it, use the `--vout sdl' or
@@@ -304,6 -322,7 +318,7 @@@
Package: vlc-plugin-svg
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: SVG plugin for VLC
This plugin allows you to render SVG graphics on top of the video. It is a text
@@@ -317,6 -336,7 +332,7 @@@
Package: vlc-plugin-zvbi
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: VBI teletext plugin for VLC
This plugin adds support for VBI teletext to the VLC media player.
diff --combined debian/rules
index 9fd3062,4d3c5dc..ce7727a
--- a/debian/rules
+++ b/debian/rules
@@@ -74,12 -74,15 +74,14 @@@ confflags +=
--enable-ncurses \
--enable-notify \
--enable-ogg \
+ --enable-opus \
--enable-oss \
--enable-pulse \
--enable-qt4 \
--enable-realrtsp \
--enable-samplerate \
- --enable-schroedinger \
--enable-sdl \
+ --enable-sftp \
--enable-shout \
--enable-skins2 \
--enable-smb \
@@@ -104,8 -107,6 +106,8 @@@
# projectm -> broken
# sqlite -> still in development
# telx -> incompatible with zvbi
+# crystalhd -> not in squeeze
+# omxil -> not in squeeze
confflags += \
--disable-dxva2 \
--disable-gnomevfs \
@@@ -114,16 -115,12 +116,16 @@@
--disable-projectm \
--disable-sqlite \
--disable-telx \
+ --disable-crystalhd \
+ --disable-omxil \
+ $(NULL)
+removeplugins += \
+ libcrystalhd \
+ libomxil \
$(NULL)
# 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 \
@@@ -132,6 -129,7 +134,6 @@@
--enable-fbosd \
--enable-libva \
--enable-linsys \
- --enable-omxil \
--enable-pvr \
--enable-udev \
$(NULL)
@@@ -171,6 -169,14 +173,6 @@@ confflags += --disable-v4l
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
@@@ -198,6 -204,9 +200,6 @@@ endi
%:
dh $@ --parallel --with autoreconf
-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 -rf tmp/
diff --combined debian/vlc-nox.install
index 68ecff4,ec16cf1..9586dcc
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@@ -18,6 -18,7 +18,7 @@@ usr/lib/vlc/plugins/access/libaccess_mt
usr/lib/vlc/plugins/access/libaccess_oss_plugin.so
usr/lib/vlc/plugins/access/libaccess_rar_plugin.so
usr/lib/vlc/plugins/access/libaccess_realrtsp_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_sftp_plugin.so
usr/lib/vlc/plugins/access/libaccess_shm_plugin.so
usr/lib/vlc/plugins/access/libaccess_smb_plugin.so
usr/lib/vlc/plugins/access/libaccess_tcp_plugin.so
@@@ -75,8 -76,10 +76,9 @@@ usr/lib/vlc/plugins/codec/liblibmpeg2_p
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/libopus_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
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list