From 25f3995210735101d7fe84c8ea323d82c466dff4 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 29 Sep 2014 09:23:39 +0200 Subject: [PATCH] Revbump pkgs that link against ffmpeg --- srcpkgs/alsa-plugins/template | 2 +- srcpkgs/audacious-plugins/template | 4 +- srcpkgs/blender/template | 13 +++-- srcpkgs/cherokee/patches/ffmpeg.patch | 14 ----- ...fix-ctk-path-handler-match_from_arch.patch | 16 ------ srcpkgs/cherokee/template | 40 +++++++++----- srcpkgs/chromaprint/template | 17 +++--- srcpkgs/cmus/template | 2 +- srcpkgs/deadbeef/template | 4 +- srcpkgs/dolphin-emu/template | 4 +- srcpkgs/freerdp/template | 6 +- srcpkgs/guvcview/template | 4 +- srcpkgs/idjc/template | 18 +++--- srcpkgs/kfilemetadata/template | 4 +- .../patches/AVCodec_compiler_error.patch | 20 ------- srcpkgs/libextractor/template | 21 ++++--- srcpkgs/libopenal/template | 13 +++-- srcpkgs/mpd/template | 9 +-- srcpkgs/mpv/template | 2 +- .../vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch | 15 +++++ srcpkgs/vlc/template | 55 ++++--------------- srcpkgs/xine-lib/template | 4 +- 22 files changed, 121 insertions(+), 166 deletions(-) delete mode 100644 srcpkgs/cherokee/patches/ffmpeg.patch delete mode 100644 srcpkgs/cherokee/patches/fix-ctk-path-handler-match_from_arch.patch delete mode 100644 srcpkgs/libextractor/patches/AVCodec_compiler_error.patch create mode 100644 srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template index 07022792788..5883e8aca5f 100644 --- a/srcpkgs/alsa-plugins/template +++ b/srcpkgs/alsa-plugins/template @@ -1,7 +1,7 @@ # Template build file for 'alsa-plugins'. pkgname=alsa-plugins version=1.0.28 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-maemo-plugin --with-speex=lib" hostmakedepends="pkg-config" diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index 6f470445e51..f6fac29e40b 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -1,7 +1,7 @@ # Template file for 'audacious-plugins'. pkgname=audacious-plugins version=3.5.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends=" @@ -11,7 +11,7 @@ makedepends=" libcurl-devel libmtp-devel neon-devel libmms-devel gtk+3-devel libxml2-devel" short_desc="Plugins for the Audacious media player" maintainer="Juan RP " -license="GPL-3" +license="BSD" homepage="http://audacious-media-player.org/" distfiles="http://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2" checksum=e6da3346df520f3c6cee3c3706eb09290840ea12dfff28d6bec32e5842dc9e26 diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index b2c97aa216a..82c3f49326f 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,17 +1,18 @@ # Template file for 'blender' pkgname=blender version=2.71 -revision=2 +revision=3 hostmakedepends="cmake" # XXX missing deps: openimageio, opencolorio -makedepends="libgomp-devel libpng-devel tiff-devel python3.4-devel glu-devel - glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel - libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm - desktop-file-utils hicolor-icon-theme libopenexr-devel" +makedepends=" + libgomp-devel libpng-devel tiff-devel python3.4-devel glu-devel + glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel + libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm + libopenexr-devel" depends="desktop-file-utils hicolor-icon-theme" build_style="cmake" maintainer="Enno Boland " -license="GPL" +license="GPL-2" homepage="http://blender.org" distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.gz" checksum=1d7d5a67a8ce5d258534fc0d426c30dbff56995b5648deba98b21b446f6e5889 diff --git a/srcpkgs/cherokee/patches/ffmpeg.patch b/srcpkgs/cherokee/patches/ffmpeg.patch deleted file mode 100644 index 03e8badf1cc..00000000000 --- a/srcpkgs/cherokee/patches/ffmpeg.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- cherokee/handler_streaming.c.ffmpeg 2012-06-04 12:56:16.000000000 +0800 -+++ cherokee/handler_streaming.c 2012-06-04 12:56:40.000000000 +0800 -@@ -380,7 +380,7 @@ - if (likely (secs > 0)) { - long tmp; - -- tmp = (hdl->avformat->file_size / secs); -+ tmp = (avio_size(hdl->avformat) / secs); - if (tmp > rate) { - rate = tmp; - TRACE(ENTRIES, "New rate: %d bytes/s\n", rate); - - - diff --git a/srcpkgs/cherokee/patches/fix-ctk-path-handler-match_from_arch.patch b/srcpkgs/cherokee/patches/fix-ctk-path-handler-match_from_arch.patch deleted file mode 100644 index b496f2e5e5e..00000000000 --- a/srcpkgs/cherokee/patches/fix-ctk-path-handler-match_from_arch.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -upr cherokee-1.2.99.orig/admin/CTK/CTK/Server.py cherokee-1.2.99/admin/CTK/CTK/Server.py ---- admin/CTK/CTK/Server.py 2011-06-06 14:17:35.000000000 +0300 -+++ admin/CTK/CTK/Server.py 2011-09-16 03:31:06.000000000 +0300 -@@ -121,8 +121,11 @@ class ServerHandler (pyscgi.SCGIHandler) - my_thread.scgi_conn = self - my_thread.request_url = url - -+ # Drop the query string before matching against the handlers -+ path = url.split('?', 1)[0] -+ - for published in server._web_paths: -- if re.match (published._regex, url): -+ if re.match (published._regex, path): - # POST - if published._method == 'POST': - post = self._process_post() diff --git a/srcpkgs/cherokee/template b/srcpkgs/cherokee/template index c051bdf7093..82326931b05 100644 --- a/srcpkgs/cherokee/template +++ b/srcpkgs/cherokee/template @@ -1,7 +1,8 @@ # Template file for 'cherokee' pkgname=cherokee -version=1.2.101 -revision=11 +version=1.2.104 +revision=1 +wrksrc="webserver-${version}" build_style=gnu-configure configure_args=" --prefix=/usr --sysconfdir=/etc --localstatedir=/var @@ -10,15 +11,14 @@ configure_args=" hostmakedepends="automake libtool python" makedepends="libressl-devel pcre-devel>=8.30 python-devel libldap-devel pam-devel libmysqlclient-devel ffmpeg-devel>=2.1 geoip-devel" -short_desc="An innovative, feature rich, and yet easy to configure open source Web Server" +short_desc="Innovative, feature rich and easy to configure web server" maintainer="Juan RP " homepage="http://www.cherokee-project.com/" license="GPL-2" -distfiles="http://pkgs.fedoraproject.org/repo/pkgs/$pkgname/${pkgname}-${version}.tar.gz/ef47003355a2e368e4d9596cd070ef23/${pkgname}-${version}.tar.gz" -checksum=ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8 +distfiles="https://github.com/${pkgname}/webserver/archive/v${version}.tar.gz" +checksum=5cbd00ff48503eaf90356b2975e311c02977f9166927e57fc23f541a109efd98 conf_files="/etc/${pkgname}/${pkgname}.conf" -systemd_services="cherokee.service on" system_accounts="httpd" httpd_descr="Cherokee HTTP server" httpd_homedir="/srv/httpd" @@ -27,8 +27,16 @@ make_dirs=" /var/log/cherokee 0755 httpd httpd /var/lib/cherokee/graphs/images 0755 httpd httpd" +build_options="systemd" +if [ "$build_option_systemd" ]; then + systemd_services="cherokee.service on" +fi + pre_configure() { - autoreconf -fi + if [ "$CROSS_BUILD" ]; then + _args="--host=${XBPS_CROSS_TRIPLET}" + fi + NOCONFIGURE=1 ./autogen.sh ${_args} # use /var/log/cherokee instead of /var/log sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre } @@ -36,25 +44,29 @@ pre_configure() { post_install() { # Setup logrotate thing vinstall ${FILESDIR}/${pkgname}.logrotate 644 etc/logrotate.d ${pkgname} - - # Install systemd service - vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system + + # Install PAM configuration file + vinstall pam.d_cherokee 644 etc/pam.d ${pkgname} + + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system + fi } cherokee-devel_package() { - depends="libcherokee>=${version}_${revision}" + depends="lib${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/bin/cherokee-config - vmove usr/include - vmove usr/lib/pkgconfig + vmove usr/include + vmove usr/lib/pkgconfig vmove usr/share/aclocal vmove "usr/lib/*.so" } } libcherokee_package() { - short_desc+=" - Runtime library" + short_desc+=" - runtime library" pkg_install() { vmove "usr/lib/*.so.*" vmove usr/lib/cherokee diff --git a/srcpkgs/chromaprint/template b/srcpkgs/chromaprint/template index 4b0aad02fee..8f0eb14abc0 100644 --- a/srcpkgs/chromaprint/template +++ b/srcpkgs/chromaprint/template @@ -1,18 +1,17 @@ # Template file for 'chromaprint' pkgname=chromaprint -version=1.1 -revision=3 -distfiles="https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-${version}.tar.gz" -checksum="6b14d7ea4964581b73bd3f8038c8857c01e446421c1ae99cbbf64de26b47cd12" -build_style="cmake" -configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=ON" +version=1.2 +revision=1 +build_style=cmake +configure_args="-DBUILD_EXAMPLES=ON" hostmakedepends="cmake" makedepends="ffmpeg-devel" maintainer="Steven R " homepage="http://acoustid.org/chromaprint/" -license="LGPL-2" -short_desc="Library that implements a custom algorithm for extracting fingerprints from any audio source" - +license="LGPL-2.1" +short_desc="Library that extracts fingerprints from any audio source" +distfiles="https://bitbucket.org/acoustid/${pkgname}/downloads/${pkgname}-${version}.tar.gz" +checksum=822b8949a322ac04c6f8a3ed78f5e689bcc493c6ca0972bf627c913c8430031a chromaprint-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template index 99190b4987b..6a3926cf872 100644 --- a/srcpkgs/cmus/template +++ b/srcpkgs/cmus/template @@ -1,7 +1,7 @@ # Template file for 'cmus' pkgname=cmus version=2.6.0 -revision=1 +revision=2 short_desc="Small, fast and powerful console music player" maintainer="Juan RP " license="GPL-2" diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template index 98062b7d825..3f2c5921896 100644 --- a/srcpkgs/deadbeef/template +++ b/srcpkgs/deadbeef/template @@ -1,7 +1,7 @@ # Template file for 'deadbeef'. pkgname=deadbeef version=0.6.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --enable-gtk3 --disable-gtk2" hostmakedepends="pkg-config intltool yasm" @@ -13,7 +13,7 @@ makedepends=" depends="desktop-file-utils hicolor-icon-theme" short_desc="Ultimate Music Player For GNU/Linux" maintainer="Juan RP " -license="GPL-2,LGPL-2.1" +license="GPL-2, LGPL-2.1" homepage="http://deadbeef.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=3433b966683286c03ffbcc79b2201cd517f8dbf6b41da8600778dfa93cd64e1a diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 4fe0969d007..9575c23d16e 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -8,14 +8,14 @@ CXXFLAGS="-mssse3" pkgname=dolphin-emu version=4.0.2 -revision=2 +revision=3 wrksrc="dolphin-${version}" build_style=cmake hostmakedepends="cmake pkg-config" makedepends=" zlib-devel glew-devel libusb-devel gtk+-devel miniupnpc-devel>=1.9 SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg-devel>=2.1 libgomp-devel - portaudio-devel libopenal-devel soundtouch-devel lzo-devel desktop-file-utils" + portaudio-devel libopenal-devel soundtouch-devel lzo-devel" depends="desktop-file-utils" short_desc="A Gamecube / Wii / Triforce emulator" maintainer="Juan RP " diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index e35a30fb9ce..6af02359628 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,7 +1,7 @@ # Template file for 'freerdp' pkgname=freerdp version=1.0.2 -revision=3 +revision=4 wrksrc="FreeRDP-${version}" build_style=cmake configure_args="-DWITH_JPEG=ON -DWITH_PULSE=ON -DWITH_XINERAMA=ON @@ -16,7 +16,7 @@ makedepends=" short_desc="A Free RDP (Remote Desktop Protocol) client" maintainer="Juan RP " license="Apache-2.0" -homepage="http://freerdp.sourceforge.net" +homepage="http://www.freerdp.com/" distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz" checksum=c0f137df7ab6fb76d7e7d316ae4e0ca6caf356e5bc0b5dadbdfadea5db992df1 @@ -29,7 +29,7 @@ pre_configure() { } libfreerdp_package() { - replaces="freerdp<1.0.2_2" + replaces="${sourcepkg}<1.0.2_2" short_desc+=" - runtime libraries" pkg_install() { vmove usr/lib/*.so.* diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template index 4abce2e0d84..1e03f0da8f2 100644 --- a/srcpkgs/guvcview/template +++ b/srcpkgs/guvcview/template @@ -1,13 +1,13 @@ # Template file for 'guvcview' pkgname=guvcview version=1.7.3 -revision=2 +revision=3 wrksrc="${pkgname}-src-${version}" build_style=gnu-configure configure_args="--disable-debian-menu" hostmakedepends="pkg-config intltool" makedepends="libudev-devel gtk+3-devel SDL-devel ffmpeg-devel libusb-devel - pulseaudio-devel v4l-utils-devel portaudio-devel desktop-file-utils" + pulseaudio-devel v4l-utils-devel portaudio-devel" depends="desktop-file-utils" short_desc="Simple GTK interface for capturing and viewing video from UVC devices" maintainer="Juan RP " diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template index 88083ae749c..6a3c678dfb7 100644 --- a/srcpkgs/idjc/template +++ b/srcpkgs/idjc/template @@ -1,23 +1,19 @@ # Template file for 'idjc' pkgname=idjc -version=0.8.9 -revision=3 +version=0.8.14 +revision=1 build_style=gnu-configure -hostmakedepends="which pkg-config" +hostmakedepends="pkg-config python-devel" makedepends=" libvorbis-devel libogg-devel jack-devel libsamplerate-devel libflac-devel libsndfile-devel libmad-devel ffmpeg-devel>=2.1 speex-devel glib-devel pixman-devel lame-devel pygtk-devel>=2.24.0_8 - libshout-idjc-devel opus-devel mutagen desktop-file-utils shared-mime-info" + libshout-idjc-devel opus-devel mutagen" depends="pygtk mutagen desktop-file-utils shared-mime-info" -pycompile_module="idjc" +pycompile_module="idjcmonitor.py idjc" short_desc="Internet DJ Console" maintainer="Juan RP " license="GPL-2" -homepage="http://${pkgname}.sourceforge.net" +homepage="http://idjc.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=b74e9a8378b951492c35ea9c2e3e665c5dd79f94958168d4ca872592ab326e71 - -pre_configure() { - sed -e 's|AVCODEC_MAX_AUDIO_FRAME_SIZE|192000|g' -i c/avcodecdecode.c -} +checksum=2cc6932f2029dd6d59780b76b29d9d7d63fdb5338ce07d99b3878f9aae7de1bc diff --git a/srcpkgs/kfilemetadata/template b/srcpkgs/kfilemetadata/template index 175ba481158..cb48cf25591 100644 --- a/srcpkgs/kfilemetadata/template +++ b/srcpkgs/kfilemetadata/template @@ -1,7 +1,7 @@ # Template file for 'kfilemetadata' pkgname=kfilemetadata version=4.13.3 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF" hostmakedepends="cmake automoc4 pkg-config" @@ -9,7 +9,7 @@ makedepends="zlib-devel libressl-devel qt-devel phonon-devel kdelibs-devel>=${ve poppler-qt4-devel ffmpeg-devel taglib-devel exiv2-devel" short_desc="A library for extracting file metadata" maintainer="Juan RP " -license="GPL, LGPL, FDL" +license="LGPL-2.1, LGPL-3" homepage="https://projects.kde.org/projects/kde/kdelibs/kfilemetadata" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" checksum=0777d591dd4328f83bdede9764fe7d70923baed0ccad779d9cc3aaddaefef4cf diff --git a/srcpkgs/libextractor/patches/AVCodec_compiler_error.patch b/srcpkgs/libextractor/patches/AVCodec_compiler_error.patch deleted file mode 100644 index 58570e6a684..00000000000 --- a/srcpkgs/libextractor/patches/AVCodec_compiler_error.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/plugins/thumbnailffmpeg_extractor.c.orig 2014-05-08 21:07:41.546845538 +0200 -+++ src/plugins/thumbnailffmpeg_extractor.c 2014-05-08 21:08:30.389842241 +0200 -@@ -335,7 +335,7 @@ - * @param ec extraction context to use - */ - static void --extract_image (enum CodecID image_codec_id, -+extract_image (enum AVCodecID image_codec_id, - struct EXTRACTOR_ExtractContext *ec) - { - AVDictionary *opts; -@@ -631,7 +631,7 @@ - /** - * Corresponding ffmpeg decoder ID. - */ -- enum CodecID codec_id; -+ enum AVCodecID codec_id; - }; - - diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template index c2d36340ea0..1a87bc0cf82 100644 --- a/srcpkgs/libextractor/template +++ b/srcpkgs/libextractor/template @@ -1,17 +1,24 @@ # Template file for 'libextractor' pkgname=libextractor -version=1.1 -revision=3 +version=1.3 +revision=1 short_desc="Library used to extract meta data from files" maintainer="Martin Riese " -license="MIT" +license="GPL-3" homepage="http://www.gnu.org/software/libextractor/" -distfiles="http://ftpmirror.gnu.org/libextractor/libextractor-${version}.tar.gz" -checksum="cbb7c2f7f92654dc09b8e5c5e353a49609a22b222ba23c944fcc14f2223172ff" +distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=868ad64c9a056d6b923d451d746935bffb1ddf5d89c3eb4f67d786001a3f7b7f build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="pkg-config" -makedepends="zlib-devel bzip2-devel exiv2-devel tiff-devel libpng-devel libjpeg-turbo-devel libvorbis-devel libflac-devel giflib-devel libmpeg2-devel ffmpeg-devel libgsf-devel gtk+3-devel libltdl-devel" +hostmakedepends="automake gettext-devel libtool pkg-config" +makedepends=" + zlib-devel bzip2-devel exiv2-devel tiff-devel libpng-devel libjpeg-turbo-devel + libvorbis-devel libflac-devel giflib-devel libmpeg2-devel ffmpeg-devel + libgsf-devel gtk+3-devel libltdl-devel libarchive-devel file-devel" + +pre_configure() { + autoreconf -fi +} libextractor-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template index 534fd391f98..14a19899081 100644 --- a/srcpkgs/libopenal/template +++ b/srcpkgs/libopenal/template @@ -1,21 +1,26 @@ # Template file for 'libopenal' pkgname=libopenal -version=1.15 -revision=6 +version=1.16.0 +revision=1 build_style=cmake wrksrc="openal-soft-${version}" short_desc="A cross-platform 3D audio library" maintainer="Juan RP " license="LGPL-2.1" -homepage="http://connect.creativelabs.com/openal/default.aspx" +homepage="http://kcat.strangesoft.net/openal.html" distfiles="http://kcat.strangesoft.net/openal-releases/openal-soft-${version}.tar.bz2" -checksum=bf58ecaf178339e86db00403b6d5c6408c9a3dfd3a077b43ac5432c52b63702d +checksum=2f3dcd313fe26391284fbf8596863723f99c65d6c6846dccb48e79cadaf40d5f hostmakedepends="pkg-config cmake" makedepends="alsa-lib-devel pulseaudio-devel SDL-devel ffmpeg-devel>=2.1" # dlopen(3)d dependencies depends="alsa-lib libpulseaudio SDL" +post_install() { + rm -f ${DESTDIR}/usr/share/openal/alsoftrc.sample + vsconf alsoftrc.sample +} + libopenal-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index 5cfaaa4b877..f88da3e72d2 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,6 +1,6 @@ # Template file for 'mpd' pkgname=mpd -version=0.18.14 +version=0.18.16 revision=1 build_style=gnu-configure configure_args=" @@ -26,7 +26,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.musicpd.org/" distfiles="http://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz" -checksum=8a33225f8abeb312f794ded01aaaa14e61ddcaf3723d298e266892343dae285d +checksum=7524c7a7695acfc6a5ce4117b30c74b172cef681a4bb9032db20c3671ad5765a # Package build options build_options="jack lame mpcdec pulseaudio systemd wavpack" @@ -57,7 +57,8 @@ post_install() { if [ "$build_option_systemd" ]; then vinstall ${FILESDIR}/tmpfiles.d 644 usr/lib/tmpfiles.d mpd.conf - vmkdir usr/lib/systemd/user - ln -s ../system/mpd.service ${DESTDIR}/usr/lib/systemd/user/mpd.service + install -Dm644 ${DESTDIR}/usr/lib/systemd/{system,user}/mpd.service + sed '/\[Service\]/a User=mpd' -i ${DESTDIR}/usr/lib/systemd/system/mpd.service + sed '/WantedBy=/c WantedBy=default.target' -i ${DESTDIR}/usr/lib/systemd/{system,user}/mpd.service fi } diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index c8fa386e320..19391a97ca6 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv version=0.5.4 -revision=1 +revision=2 short_desc="Video player based on MPlayer/mplayer2" maintainer="Juan RP " license="GPL-2" diff --git a/srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch b/srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch new file mode 100644 index 00000000000..3dd93c91d97 --- /dev/null +++ b/srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch @@ -0,0 +1,15 @@ +diff --git configure.ac.orig configure.ac +index a684338..053713a 100644 +--- configure.ac.orig ++++ configure.ac +@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec, + [ --enable-avcodec libavcodec codec (default enabled)]) + AS_IF([test "${enable_avcodec}" != "no"], [ + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ +- PKG_CHECK_EXISTS([libavcodec < 56],, [ +- AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.]) ++ PKG_CHECK_EXISTS([libavcodec < 57],, [ ++ AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.]) + ]) + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index c0cf802df3d..b8fc8a628ef 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,15 +1,17 @@ # Template file for 'vlc' pkgname=vlc version=2.1.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --disable-lua --disable-live555 --disable-fluidsynth - --enable-dvdread --enable-flac --disable-gnomevfs" -short_desc="VideoLan Client - A highly portable multimedia player" + --enable-dvdread --enable-flac --disable-gnomevfs + $(vopt_enable notify) $(vopt_enable opengl glx) $(vopt_enable qt) + $(vopt_enable svg) $(vopt_enable v4l v4l2)" +short_desc="A cross-platform multimedia player" maintainer="Juan RP " homepage="http://www.videolan.org/vlc/" -license="GPL-2" +license="GPL-2, LGPL-2.1" distfiles="http://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz" checksum=6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 @@ -17,7 +19,7 @@ lib32disabled=yes # XXX Add missing deps: gme, telepathy, lua, live555, libtar (for skins2). hostmakedepends="automake libtool pkg-config libgcrypt-devel" -makedepends="videoproto libudev-devel>=183 libpng-devel>=1.6 libupnp-devel +makedepends="videoproto libudev-devel libpng-devel>=1.6 libupnp-devel ncurses-devel libvorbis-devel x264-devel>=20131007.2245_2 ffmpeg-devel>=2.1 xcb-util-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9 libsamplerate-devel libXxf86vm-devel libXinerama-devel libXpm-devel libXvMC-devel libXv-devel @@ -27,7 +29,9 @@ makedepends="videoproto libudev-devel>=183 libpng-devel>=1.6 libupnp-devel gnutls-devel>=3.1.5 taglib-devel libmatroska-devel>=1.4.1 libmpcdec-devel libcdio-devel libdvdnav-devel libsysfs-devel libmtp-devel>=1.1.4 sqlite-devel libtheora-devel speex-devel pulseaudio-devel libxml2-devel - opus-devel libbluray-devel faad2-devel jack-devel libSM-devel freefont-ttf" + opus-devel libbluray-devel faad2-devel jack-devel libSM-devel freefont-ttf + $(vopt_if notify libnotify-devel) $(vopt_if opengl MesaLib-devel) + $(vopt_if qt qt-devel) $(vopt_if svg librsvg-devel) $(vopt_if v4l v4l-utils-devel)" depends="freefont-ttf hicolor-icon-theme desktop-file-utils" if [ "$XBPS_TARGET_MACHINE" = "i686" ] || [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then @@ -58,41 +62,6 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default+=" libnotify qt" fi -if [ "$build_option_notify" ]; then - configure_args+=" --enable-notify" - makedepends+=" libnotify-devel" -else - configure_args+=" --disable-notify" -fi - -if [ "$build_option_opengl" ]; then - configure_args+=" --enable-glx" - makedepends+=" MesaLib-devel" -else - configure_args+=" --disable-glx" -fi - -if [ "$build_option_qt" ]; then - configure_args+=" --enable-qt" - makedepends+=" qt-devel" -else - configure_args+=" --disable-qt" -fi - -if [ "$build_option_svg" ]; then - configure_args+=" --enable-svg" - makedepends+=" librsvg-devel" -else - configure_args+=" --disable-svg" -fi - -if [ "$build_option_v4l" ]; then - configure_args+=" --enable-v4l2" - makedepends+=" v4l-utils-devel" -else - configure_args+=" --disable-v4l2" -fi - pre_configure() { NOCONFIGURE=1 ./bootstrap @@ -114,7 +83,7 @@ post_install() { } libvlc_package() { - replaces="vlc<2.1.1_2" + replaces="${sourcepkg}<2.1.1_2" short_desc+=" - runtime libraries" pkg_install() { vmove "usr/lib/*.so.*" @@ -128,7 +97,7 @@ libvlc_package() { vlc-devel_package() { short_desc+=" - development files" - depends+=" libvlc>=${version}_${revision}" + depends+=" lib${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template index cd8c4f841b3..438e6beff8d 100644 --- a/srcpkgs/xine-lib/template +++ b/srcpkgs/xine-lib/template @@ -1,7 +1,7 @@ # Template file for 'xine-lib' pkgname=xine-lib version=1.2.6 -revision=2 +revision=3 build_style=gnu-configure configure_args=" --disable-vcd --disable-gnomevfs --without-esound --disable-dxr3 --disable-oss" @@ -15,7 +15,7 @@ makedepends=" libjpeg-turbo-devel libmng-devel" short_desc="A multimedia playback engine" maintainer="Juan RP " -license="GPL, LGPL" +license="GPL-2, LGPL-2.1" homepage="http://www.xine-project.org" distfiles="${SOURCEFORGE_SITE}/xine/$pkgname-$version.tar.xz" checksum=bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005