[arch-commits] Commit in vlc/trunk (2 files)
Date: Monday, September 3, 2018 @ 23:08:46 Author: anthraxx Revision: 333238 upgpkg: vlc 3.0.4-1 Modified: vlc/trunk/PKGBUILD Deleted: vlc/trunk/aom-remove-unsupported-pixel-formats.patch + PKGBUILD | 28 +++- aom-remove-unsupported-pixel-formats.patch | 37 --- 2 files changed, 16 insertions(+), 49 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-09-03 22:57:31 UTC (rev 333237) +++ PKGBUILD2018-09-03 23:08:46 UTC (rev 333238) @@ -4,11 +4,11 @@ # Contributor: Martin Sandsmark pkgname=vlc -_vlcver=3.0.3 +_vlcver=3.0.4 # optional fixup version including hyphen -_vlcfixupver=-1 +_vlcfixupver= pkgver=${_vlcver}${_vlcfixupver//-/.r} -pkgrel=2 +pkgrel=1 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player' url='https://www.videolan.org/vlc/' arch=('x86_64') @@ -28,7 +28,7 @@ 'libvorbis' 'speex' 'opus' 'libtheora' 'libpng' 'libjpeg-turbo' 'libx265.so' 'libx264.so' 'zvbi' 'libass' 'libkate' 'libtiger' 'sdl_image' 'libpulse' 'alsa-lib' 'jack' 'libsamplerate' 'libsoxr' - 'lirc' 'libgoom2' 'projectm' 'chromaprint') + 'lirc' 'libgoom2' 'projectm' 'chromaprint' 'aribb24') optdepends=('avahi: service discovery using bonjour protocol' 'gst-plugins-base-libs: for libgst plugins' 'libdvdcss: decoding encrypted DVDs' @@ -72,6 +72,7 @@ 'x265: HEVC/H.265 encoder' 'zvbi: VBI/Teletext decoding' 'libass: Subtitle support' +'aribb24: ARIB subtitles' 'libkate: Kate codec' 'libtiger: Tiger rendering for Kate streams' 'sdl_image: SDL image support' @@ -94,14 +95,12 @@ options=('!emptydirs') source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc} update-vlc-plugin-cache.hook -aom-remove-unsupported-pixel-formats.patch lua53_compat.patch vlc-qt5.11.patch vlc-x264-155.patch) -sha512sums=('d1979f6149821cf91d7b40b18d83d399b9021966b60589615638423a4e2c3ff86fdbbe9c0d92c85bfdd90f03991256ccee95d7a33ae96326177bb2bfe85e7a0f' +sha512sums=('55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271' 'SKIP' '80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df' - '5757a6f35e106883072c31d137fd247c65a544f730cf736ca2e81a31357305b5c002b52349337d8e1667fbe68628bc253ec69eee727f268aee7902a5bef82dce' '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f' '66aad0ec32d1a96f65566b04eb9c0b4574824e281940fe5c0de54ac5f92189693a9f2576203d2c8562d7174ec5315cbbd683d93c481d16119d3038e30a58cbf5' '47b844c7ada22042a0aab67d485ee68fda4847400dedd0f5662eb3738c1e45a06b50a6a045f3af1f07625ebd6f021bd43acaa9a8e63720e3b1207ad0d23bb36f') @@ -113,10 +112,14 @@ sed -e 's|-Werror-implicit-function-declaration||g' -i configure sed 's|whoami|echo builduser|g' -i configure sed 's|hostname -f|echo arch|g' -i configure - patch -Np1 < "${srcdir}/aom-remove-unsupported-pixel-formats.patch" - patch -Np1 < "${srcdir}/lua53_compat.patch" - patch -Np1 < "${srcdir}/vlc-qt5.11.patch" - patch -Np1 < "${srcdir}/vlc-x264-155.patch" + local src + for src in "${source[@]}"; do +src="${src%%::*}" +src="${src##*/}" +[[ $src = *.patch ]] || continue +msg2 "Applying patch $src..." +patch -Np1 < "../$src" + done } build() { @@ -131,6 +134,7 @@ ./configure --prefix=/usr \ --sysconfdir=/etc \ + --with-kde-solid=/usr/share/solid/actions/ \ --disable-rpath \ --enable-nls \ --enable-archive \ @@ -219,7 +223,7 @@ --enable-notify \ --enable-libplacebo \ --enable-vlc \ - --with-kde-solid=/usr/share/solid/actions/ + --enable-aribsub make } Deleted: aom-remove-unsupported-pixel-formats.patch === --- aom-remove-unsupported-pixel-formats.patch 2018-09-03 22:57:31 UTC (rev 333237) +++ aom-remove-unsupported-pixel-formats.patch 2018-09-03 23:08:46 UTC (rev 333238) @@ -1,37 +0,0 @@ -From 622360c2c4335fff793f81f5e673326a581f5c0c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= -Date: Thu, 19 Apr 2018 18:25:07 +0300 -Subject: [PATCH] aom: Remove unsupported pixel formats - -Support for these was apparently never in the codebase, and the enum -values were recently removed from the public headers [1]. - -This fixes build with latest libaom build. -
[arch-commits] Commit in vlc/trunk (2 files)
Date: Thursday, July 5, 2018 @ 13:18:05 Author: foutrelis Revision: 327992 upgpkg: vlc 3.0.3-2 libnfs 3.0.0 rebuild Added: vlc/trunk/aom-remove-unsupported-pixel-formats.patch Modified: vlc/trunk/PKGBUILD + PKGBUILD |7 +++-- aom-remove-unsupported-pixel-formats.patch | 37 +++ 2 files changed, 42 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-07-05 12:57:25 UTC (rev 327991) +++ PKGBUILD2018-07-05 13:18:05 UTC (rev 327992) @@ -5,7 +5,7 @@ pkgname=vlc pkgver=3.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player' url='https://www.videolan.org/vlc/' arch=('x86_64') @@ -92,11 +92,13 @@ options=('!emptydirs') source=(https://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz{,.asc} update-vlc-plugin-cache.hook +aom-remove-unsupported-pixel-formats.patch lua53_compat.patch vlc-qt5.11.patch) sha512sums=('1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab' 'SKIP' '80357bae69e32b353d3784932d854e294906798e14faffb87c3383c3b6f6bdc57cbabb9c6e3f3c1adf0f8ddbb24153e72104c963cf1934970c2983c96daef9df' + '5757a6f35e106883072c31d137fd247c65a544f730cf736ca2e81a31357305b5c002b52349337d8e1667fbe68628bc253ec69eee727f268aee7902a5bef82dce' '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f' '66aad0ec32d1a96f65566b04eb9c0b4574824e281940fe5c0de54ac5f92189693a9f2576203d2c8562d7174ec5315cbbd683d93c481d16119d3038e30a58cbf5') validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key @@ -105,9 +107,10 @@ cd ${pkgname}-${pkgver} sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp sed -e 's|-Werror-implicit-function-declaration||g' -i configure - patch -Np1 < "${srcdir}/lua53_compat.patch" sed 's|whoami|echo builduser|g' -i configure sed 's|hostname -f|echo arch|g' -i configure + patch -Np1 < "${srcdir}/aom-remove-unsupported-pixel-formats.patch" + patch -Np1 < "${srcdir}/lua53_compat.patch" patch -Np1 < "${srcdir}/vlc-qt5.11.patch" } Added: aom-remove-unsupported-pixel-formats.patch === --- aom-remove-unsupported-pixel-formats.patch (rev 0) +++ aom-remove-unsupported-pixel-formats.patch 2018-07-05 13:18:05 UTC (rev 327992) @@ -0,0 +1,37 @@ +From 622360c2c4335fff793f81f5e673326a581f5c0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= +Date: Thu, 19 Apr 2018 18:25:07 +0300 +Subject: [PATCH] aom: Remove unsupported pixel formats + +Support for these was apparently never in the codebase, and the enum +values were recently removed from the public headers [1]. + +This fixes build with latest libaom build. + +[1] https://aomedia.googlesource.com/aom/+/3f29cc20e3a4c348cb41a797c68de856ddb84e12 +--- + modules/codec/aom.c | 11 --- + 1 file changed, 11 deletions(-) + +diff --git a/modules/codec/aom.c b/modules/codec/aom.c +index 5bb442b5d50..60034158c47 100644 +--- a/modules/codec/aom.c b/modules/codec/aom.c +@@ -116,17 +116,6 @@ static const struct + + { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 }, + { VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 }, +-{ VLC_CODEC_YUYV, AOM_IMG_FMT_YUY2, 8, 0 }, +-{ VLC_CODEC_UYVY, AOM_IMG_FMT_UYVY, 8, 0 }, +-{ VLC_CODEC_YVYU, AOM_IMG_FMT_YVYU, 8, 0 }, +- +-{ VLC_CODEC_RGB15, AOM_IMG_FMT_RGB555, 8, 0 }, +-{ VLC_CODEC_RGB16, AOM_IMG_FMT_RGB565, 8, 0 }, +-{ VLC_CODEC_RGB24, AOM_IMG_FMT_RGB24, 8, 0 }, +-{ VLC_CODEC_RGB32, AOM_IMG_FMT_RGB32, 8, 0 }, +- +-{ VLC_CODEC_ARGB, AOM_IMG_FMT_ARGB, 8, 0 }, +-{ VLC_CODEC_BGRA, AOM_IMG_FMT_ARGB_LE, 8, 0 }, + + { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 }, + { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 },
[arch-commits] Commit in vlc/trunk (2 files)
Date: Monday, October 13, 2014 @ 08:35:50 Author: bpiotrowski Revision: 224255 upgpkg: vlc 2.1.5-4 apply possible fix for segfaults with ffmpeg 2.4 (FS#42099) Added: vlc/trunk/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch Modified: vlc/trunk/PKGBUILD + PKGBUILD | 11 ++-- vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch | 26 +++ 2 files changed, 33 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-10-13 00:57:15 UTC (rev 224254) +++ PKGBUILD2014-10-13 06:35:50 UTC (rev 224255) @@ -5,7 +5,7 @@ pkgname=vlc pkgver=2.1.5 -pkgrel=3 +pkgrel=4 pkgdesc=A multi-platform MPEG, VCD/DVD, and DivX player arch=('i686' 'x86_64') url=http://www.videolan.org/vlc/; @@ -58,16 +58,19 @@ install=vlc.install source=(http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz; 'vlc-2.0.7-vaapi-compat.patch' -'vlc-2.1.5-ffmpeg-2.4.patch') +'vlc-2.1.5-ffmpeg-2.4.patch' +'vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch') md5sums=('3941b561f590cc95ca5e795213cba2f2' '6df10774bb7acf20e09d6139e5c7839e' - '068a1b792064bb1aff0765a3ffa8a27a') + '068a1b792064bb1aff0765a3ffa8a27a' + '787a854f3acde37cd6e76a8fa8e6f1d0') prepare() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/vlc-2.0.7-vaapi-compat.patch + patch -p1 -i ${srcdir}/vlc-2.0.7-vaapi-compat.patch patch -p1 -i ${srcdir}/vlc-2.1.5-ffmpeg-2.4.patch + patch -p1 -i ${srcdir}/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch autoreconf -fi sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c Added: vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch === --- vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch (rev 0) +++ vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch 2014-10-13 06:35:50 UTC (rev 224255) @@ -0,0 +1,26 @@ +From 1e31a5a18bb0087f9e625919a805d64a2af40bbe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= r...@remlab.net +Date: Wed, 30 Jul 2014 19:05:43 +0300 +Subject: [PATCH] avformat: initialize probe data (fixes #11851) + +(cherry picked from commit 49bd1c657d960ba107d9db8752f716139a938eee) +--- + modules/demux/avformat/demux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c +index bdd77fd..7349db2 100644 +--- a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c +@@ -157,7 +157,7 @@ int OpenDemux( vlc_object_t *p_this ) + { + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; +-AVProbeData pd; ++AVProbeData pd = { }; + AVInputFormat *fmt = NULL; + unsigned int i; + int64_t i_start_time = -1; +-- +2.1.0 +
[arch-commits] Commit in vlc/trunk (2 files)
Date: Thursday, September 26, 2013 @ 10:25:07 Author: bpiotrowski Revision: 195166 upgpkg: vlc 2.1.0-1 - new upstream release - remove OSS support - switch back to extra/ffmpeg - build against Lua 5.2 Modified: vlc/trunk/PKGBUILD Deleted: vlc/trunk/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch -+ PKGBUILD| 21 - vlc-2.0.8-Fix-live555-breakage-in-last-update.patch | 29 -- 2 files changed, 8 insertions(+), 42 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-26 05:26:20 UTC (rev 195165) +++ PKGBUILD2013-09-26 08:25:07 UTC (rev 195166) @@ -4,7 +4,7 @@ # Contributor: Martin Sandsmark martin.sandsm...@kde.org pkgname=vlc -pkgver=2.0.8.a +pkgver=2.1.0 pkgrel=1 pkgdesc=A multi-platform MPEG, VCD/DVD, and DivX player arch=('i686' 'x86_64') @@ -11,12 +11,12 @@ url=http://www.videolan.org/vlc/; license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' - 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' + 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' + 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' - 'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' 'oss' - 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd' 'projectm' + 'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' + 'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' 'mesa') optdepends=('avahi: for service discovery using bonjour protocol' @@ -31,7 +31,6 @@ 'libva-intel-driver: back-end for intel cards' 'libbluray: for Blu-Ray support' 'flac: for Free Lossless Audio Codec plugin' -'oss: for OSS audio support' 'portaudio: for portaudio support' 'twolame: for TwoLAME mpeg2 encoder plugin' 'projectm: for ProjectM visualisation plugin' @@ -57,17 +56,14 @@ options=('!libtool' '!emptydirs') install=vlc.install source=(http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz; -vlc-2.0.7-vaapi-compat.patch -vlc-2.0.8-Fix-live555-breakage-in-last-update.patch) -md5sums=('e5000677181406d026ffe448633d1ca0' - '6df10774bb7acf20e09d6139e5c7839e' - 'e592efe7bb65291a84f99cfaa3a9f8a2') +vlc-2.0.7-vaapi-compat.patch) +md5sums=('8c77bda671821f5b9ede96b6816e2ade' + '6df10774bb7acf20e09d6139e5c7839e') prepare() { cd ${srcdir}/${pkgname}-${pkgver/.a} patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch - patch -Np1 -i ../vlc-2.0.8-Fix-live555-breakage-in-last-update.patch sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp @@ -81,7 +77,6 @@ ./configure --prefix=/usr \ --sysconfdir=/etc \ --disable-rpath \ - --enable-oss \ --enable-faad \ --enable-nls \ --enable-lirc \ Deleted: vlc-2.0.8-Fix-live555-breakage-in-last-update.patch === --- vlc-2.0.8-Fix-live555-breakage-in-last-update.patch 2013-09-26 05:26:20 UTC (rev 195165) +++ vlc-2.0.8-Fix-live555-breakage-in-last-update.patch 2013-09-26 08:25:07 UTC (rev 195166) @@ -1,29 +0,0 @@ -From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001 -From: Jean-Baptiste Kempf j...@videolan.org -Date: Thu, 25 Jul 2013 01:14:32 +0200 -Subject: [PATCH] Fix live555 breakage in last update - - modules/demux/live555.cpp | 6 +- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp -index 9e02630..7a1ab16 100644 a/modules/demux/live555.cpp -+++ b/modules/demux/live555.cpp -@@ -243,7 +243,11 @@ public: -char const* applicationName, portNumBits tunnelOverHTTPPortNum, -demux_sys_t *p_sys) : -RTSPClient( env, rtspURL, verbosityLevel, applicationName, -- tunnelOverHTTPPortNum ) -+ tunnelOverHTTPPortNum -+#if LIVEMEDIA_LIBRARY_VERSION_INT = 1373932800 -+ , -1 -+#endif -+ ) - { - this-p_sys = p_sys; - } --- -1.8.3.4 -
[arch-commits] Commit in vlc/trunk (2 files)
Date: Friday, August 2, 2013 @ 11:52:13 Author: bpiotrowski Revision: 191971 Fix build with live-media 2013.07.16. Added: vlc/trunk/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch Modified: vlc/trunk/PKGBUILD -+ PKGBUILD|7 +++- vlc-2.0.8-Fix-live555-breakage-in-last-update.patch | 29 ++ 2 files changed, 34 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-08-02 08:44:12 UTC (rev 191970) +++ PKGBUILD2013-08-02 09:52:13 UTC (rev 191971) @@ -57,14 +57,17 @@ options=('!libtool' '!emptydirs') install=vlc.install source=(http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz; -vlc-2.0.7-vaapi-compat.patch) +vlc-2.0.7-vaapi-compat.patch +vlc-2.0.8-Fix-live555-breakage-in-last-update.patch) md5sums=('e5000677181406d026ffe448633d1ca0' - '6df10774bb7acf20e09d6139e5c7839e') + '6df10774bb7acf20e09d6139e5c7839e' + 'e592efe7bb65291a84f99cfaa3a9f8a2') prepare() { cd ${srcdir}/${pkgname}-${pkgver/.a} patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch + patch -Np1 -i ../vlc-2.0.8-Fix-live555-breakage-in-last-update.patch sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp Added: vlc-2.0.8-Fix-live555-breakage-in-last-update.patch === --- vlc-2.0.8-Fix-live555-breakage-in-last-update.patch (rev 0) +++ vlc-2.0.8-Fix-live555-breakage-in-last-update.patch 2013-08-02 09:52:13 UTC (rev 191971) @@ -0,0 +1,29 @@ +From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf j...@videolan.org +Date: Thu, 25 Jul 2013 01:14:32 +0200 +Subject: [PATCH] Fix live555 breakage in last update + +--- + modules/demux/live555.cpp | 6 +- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp +index 9e02630..7a1ab16 100644 +--- a/modules/demux/live555.cpp b/modules/demux/live555.cpp +@@ -243,7 +243,11 @@ public: +char const* applicationName, portNumBits tunnelOverHTTPPortNum, +demux_sys_t *p_sys) : +RTSPClient( env, rtspURL, verbosityLevel, applicationName, +- tunnelOverHTTPPortNum ) ++ tunnelOverHTTPPortNum ++#if LIVEMEDIA_LIBRARY_VERSION_INT = 1373932800 ++ , -1 ++#endif ++ ) + { + this-p_sys = p_sys; + } +-- +1.8.3.4 +