[SCM] VLC media player packaging branch, experimental, updated. debian/1.1.1-1-6-g75c595b
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Thu Jul 22 19:31:23 UTC 2010
The following commit has been merged in the experimental branch:
commit 5ffd49d0ba8725781153bf5b662d79694e6f88b2
Merge: 67570552784a7b53758cc307b0e14b541339dda4 1a03c1205177833520887ce53f42330f6fc32623
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Thu Jul 22 01:30:33 2010 +0200
Merge branch 'sid' into experimental
Conflicts:
debian/changelog
debian/patches/series
debian/rules
diff --combined debian/changelog
index 097cb85,311edcf..21a48c6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,14 +1,22 @@@
- vlc (1.1.0-4+exp1~3.gbp3949bb) UNRELEASED; urgency=low
++vlc (1.1.1-1+exp1~3.gbp3949bb) UNRELEASED; urgency=low
+
+ ** SNAPSHOT build @3949bb65d022ae61e0069a42029405f942833bf2 **
+
+ * Depends on xulrunner-dev >= 1.9.2
+ * Activate VA-API (Closes: #587792)
+
+ -- Christophe Mutricy <xtophe at videolan.org> Sun, 18 Jul 2010 19:46:07 +0200
+ vlc (1.1.1-1) unstable; urgency=low
+
+ * New upstream release
+ + Remove patches merged upstream
+ + Add new symbols in libvlc5
+ * Explicit the split of vlc-plugin-zvbi in debian/changelog (Closes:
+ #588468)
+ * Disable modplug as libmodplug in sid is buggy (see #588465)
+ * Add comment about merging in README.source
+
+ -- Christophe Mutricy <xtophe at videolan.org> Thu, 22 Jul 2010 00:36:00 +0200
vlc (1.1.0-4) unstable; urgency=low
@@@ -82,6 -85,7 +93,7 @@@ vlc (1.1.0-1) unstable; urgency=lo
* Remove unused Build-Depends libid3tag0-dev, libsysfs-dev, and libxv-dev.
* Provide VBI teletext plugin (Closes: #563873) - thanks to László
Benedek <benedekl at gmail.com> for the patch.
+ * Split the VBI teletext module to its own package vlc-plugin-zvbi.
* Enable atmo, fluidsynth (separate package), libproxy (Closes: #532110),
kate (Closes: #563464), and mtp plugin.
* Comment disabled features.
diff --combined debian/control
index 2edd2f6,ba9388e..58558c8
--- a/debian/control
+++ b/debian/control
@@@ -17,8 -17,8 +17,8 @@@ Build-Depends: debhelper (>= 7.2.3~)
libass-dev (>= 0.9.5-2),
libavahi-client-dev,
libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libavcodec-dev (>= 0.cvs20060823),
- libavformat-dev (>= 0.cvs20060823),
+ libavcodec-dev (>= 4:0.6),
+ libavformat-dev (>= 4:0.6),
libcaca-dev (>= 0.99.beta4),
libcddb2-dev,
libcdio-dev,
@@@ -44,7 -44,6 +44,6 @@@
liblua5.1-0-dev,
libmad0-dev,
libmatroska-dev (>= 0.8.0),
- libmodplug-dev,
libmpcdec-dev,
libmpeg2-4-dev,
libmtp-dev,
@@@ -52,7 -51,7 +51,7 @@@
libnotify-dev,
libogg-dev,
libpng12-dev,
- libpostproc-dev (>= 0.cvs20060823),
+ libpostproc-dev (>= 4:0.6),
libproxy-dev,
libpulse-dev,
libqt4-dev,
@@@ -65,7 -64,7 +64,7 @@@
libsmbclient-dev,
libspeex-dev,
libsvga1-dev [amd64 i386],
- libswscale-dev,
+ libswscale-dev (>= 4:0.6),
libtag1-dev,
libtar-dev,
libtheora-dev,
@@@ -73,7 -72,6 +72,7 @@@
libudev-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libupnp3-dev,
libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libva-dev,
libvcdinfo-dev,
libvorbis-dev,
libx11-dev,
@@@ -91,7 -89,7 +90,7 @@@
lua5.1,
nasm,
pkg-config,
- xulrunner-dev,
+ xulrunner-dev (>= 1.9.2),
yasm [amd64 kfreebsd-amd64],
zlib1g-dev
Standards-Version: 3.9.0
diff --combined debian/patches/series
index ae29a98,b6bad6f..bae69ca
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -3,5 -3,4 +3,3 @@@
104_notify.diff
200_osdmenu_paths.diff
501_decrease_alsa_buffer.diff
- 503_mpeg2_arm.diff
- 504_fix_kfreebsd_ftbfs_access_file_module.diff
-502_xulrunner_191.diff
diff --combined debian/rules
index 5c70a96,5cf074d..6f70a7d
--- a/debian/rules
+++ b/debian/rules
@@@ -63,7 -63,6 +63,7 @@@ confflags +=
--enable-libass \
--enable-libmpeg2 \
--enable-libproxy \
+ --enable-libva \
--enable-libxml2 \
--enable-lirc \
--enable-live555 \
@@@ -102,6 -101,8 +102,7 @@@
# dxva2 -> Windows only
# gnomevfs -> poorly maintained
# goom -> not in Debian
-# libva -> needs a vaapi enabled avcodec
+ # modplug -> http://bugs.debian.org/588465
# osso_screensaver -> not targetting maemo
# portaudio -> not needed
# projectm -> broken
@@@ -112,6 -113,8 +113,7 @@@ confflags +=
--disable-dxva2 \
--disable-gnomevfs \
--disable-goom \
- --disable-libva \
+ --disable-mod \
--disable-osso_screensaver \
--disable-portaudio \
--disable-projectm \
@@@ -136,8 -139,8 +138,8 @@@ endi
ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
confflags += \
- --disable-alsa \
- $(NULL)
+ --disable-alsa \
+ $(NULL)
endif
# svgalib is only for x86 and x86-64 on Linux
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list