From cbdd51169f5ab48d2830233471d2d07a968a3dbc Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 29 Sep 2014 20:17:56 +0200 Subject: [PATCH] Revbump pkgs that link against x264 --- srcpkgs/ffmpeg/template | 8 ++++---- srcpkgs/gst-plugins-ugly/template | 9 +++++---- srcpkgs/gst-plugins-ugly1/template | 4 ++-- srcpkgs/handbrake/template | 15 +++++++-------- srcpkgs/mplayer/template | 6 +++--- srcpkgs/ogmrip/template | 12 ++++++------ srcpkgs/vlc/template | 4 ++-- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 0df3af0f65..ef18d0a7b7 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,7 +1,7 @@ # Template file for 'ffmpeg' pkgname=ffmpeg version=2.4.1 -revision=1 +revision=2 short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" @@ -12,9 +12,9 @@ checksum=b4aecfce2c41ea4a21320dad818aa9a365b09a9cafe0b7173359cba86683c7f3 hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel - libvorbis-devel x264-devel>=20131007 xvidcore-devel jack-devel SDL-devel libcdio-devel - libvpx-devel librtmp-devel freetype-devel libmodplug-devel speex-devel - celt-devel harfbuzz-devel libass-devel opus-devel pulseaudio-devel" + libvorbis-devel x264-devel>=20140928 xvidcore-devel jack-devel SDL-devel + libcdio-devel libvpx-devel librtmp-devel freetype-devel libmodplug-devel + speex-devel celt-devel harfbuzz-devel libass-devel opus-devel pulseaudio-devel" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) makedepends+=" libva-devel libvdpau-devel";; diff --git a/srcpkgs/gst-plugins-ugly/template b/srcpkgs/gst-plugins-ugly/template index 039acad480..1b833457c1 100644 --- a/srcpkgs/gst-plugins-ugly/template +++ b/srcpkgs/gst-plugins-ugly/template @@ -1,15 +1,16 @@ # Template file for 'gst-plugins-ugly'. pkgname=gst-plugins-ugly version=0.10.19 -revision=6 +revision=7 lib32disabled=yes build_style=gnu-configure configure_args="--enable-experimental" # XXX: add required pkgs for the amr, sid plugins. hostmakedepends="pkg-config intltool" -makedepends="glib-devel libxml2-devel gstreamer-devel - gst-plugins-base-devel libcdio-devel libdvdread-devel x264-devel>=20131007.2245_2 - libmad-devel orc-devel liba52-devel libmpeg2-devel lame-devel" +makedepends=" + glib-devel libxml2-devel gstreamer-devel gst-plugins-base-devel + libcdio-devel libdvdread-devel x264-devel>=20140928 libmad-devel + orc-devel liba52-devel libmpeg2-devel lame-devel" short_desc="GStreamer plugins from the ugly set" maintainer="Juan RP " license="GPL-2, LGPL-2.1" diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index d9118872e2..73a013d0ef 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-ugly1'. pkgname=gst-plugins-ugly1 version=1:1.4.2 -revision=1 +revision=2 lib32disabled=yes wrksrc="${pkgname/1/}-${version#*:}" build_style=gnu-configure @@ -9,7 +9,7 @@ configure_args="--enable-experimental" # XXX add required pkgs for the amr, sid plugins. hostmakedepends="pkg-config intltool python" makedepends="glib-devel libxml2-devel gst-plugins-base1-devel>=${version} - libcdio-devel libdvdread-devel libmad-devel x264-devel>=20131007.2245_2 + libcdio-devel libdvdread-devel libmad-devel x264-devel>=20140928 orc-devel>=0.4.18 liba52-devel libmpeg2-devel lame-devel" depends="orc>=0.4.18 gst-plugins-base1>=${version}" short_desc="GStreamer plugins from the ugly set (1.x)" diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template index ce70999d61..83840ec2a8 100644 --- a/srcpkgs/handbrake/template +++ b/srcpkgs/handbrake/template @@ -3,31 +3,30 @@ only_for_archs="i686 x86_64" pkgname=handbrake version=0.9.9 -revision=3 +revision=4 wrksrc="HandBrake-${version}" hostmakedepends="pkg-config intltool automake libtool python yasm wget gettext-devel" makedepends="zlib-devel bzip2-devel libnotify-devel gtk+3-devel ncurses-devel - gst-plugins-base-devel gst-plugins-good webkitgtk-devel x264-devel>=20131007 + gst-plugins-base-devel gst-plugins-good webkitgtk-devel x264-devel>=20140928 dbus-glib-devel fribidi-devel libass-devel fontconfig-devel libxml2-devel - libogg-devel libtheora-devel libsamplerate-devel libbluray-devel - hicolor-icon-theme desktop-file-utils" -depends="gst-plugins-good" + libogg-devel libtheora-devel libsamplerate-devel libbluray-devel" +depends="gst-plugins-good desktop-file-utils hicolor-icon-theme" short_desc="Multithreaded video transcoder" maintainer="Juan RP " -license="GPL-3" +license="GPL-2" homepage="http://handbrake.fr/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/HandBrake-${version}.tar.bz2" checksum=a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3 do_configure() { - sed -e '/MODULES += contrib\/libbluray/d' \ + sed -e '/MODULES += contrib\/libbluray/d' \ -e '/MODULES += contrib\/x264/d' \ -i make/include/main.defs cd gtk sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ -e '/AM_PROG_CC_STDC/d' -i configure.ac - autoreconf -vi + autoreconf -fi cd ${wrksrc} export CFLAGS+=" -msse" diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template index 5f67e655d6..bfe95307ce 100644 --- a/srcpkgs/mplayer/template +++ b/srcpkgs/mplayer/template @@ -1,7 +1,7 @@ # Template file for 'mplayer' pkgname=mplayer version=1.1.1 -revision=8 +revision=9 wrksrc="MPlayer-${version}" short_desc="A movie player" maintainer="Juan RP " @@ -24,8 +24,8 @@ nocross=yes hostmakedepends="pkg-config yasm" makedepends="videoproto libudev-devel libpng-devel>=1.6 - libvorbis-devel SDL_image-devel x264-devel>=20131007 jack-devel samba-devel mpg123-devel - xcb-util-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9 libsamplerate-devel + libvorbis-devel SDL_image-devel x264-devel>=20140928 jack-devel samba-devel + mpg123-devel 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 libmpeg2-devel libflac-devel fribidi-devel freetype-devel libmtp-devel>=1.1.4 avahi-libs-devel MesaLib-devel libmad-devel liba52-devel libdca-devel diff --git a/srcpkgs/ogmrip/template b/srcpkgs/ogmrip/template index cea2f57016..f660f03572 100644 --- a/srcpkgs/ogmrip/template +++ b/srcpkgs/ogmrip/template @@ -1,17 +1,17 @@ # Template file for 'ogmrip' pkgname=ogmrip -version=1.0.0 -revision=2 +version=1.0.1 +revision=1 short_desc="Application and ripping and encoding DVD into AVI, OGM, MP4, or Matroska" maintainer="Martin Riese " -license="LGPL-2" +license="LGPL-2.1" homepage="http://ogmrip.sourceforge.net/en/index.html" -distfiles="${SOURCEFORGE_SITE}/ogmrip/ogmrip/1.0/${version}/ogmrip-${version}.tar.gz" -checksum="6848a622152a62899b6e876e70ec36df1af7be9803b8b9c809ed631196bc18cc" +distfiles="${SOURCEFORGE_SITE}/ogmrip/ogmrip/${version%.*}/${version}/ogmrip-${version}.tar.gz" +checksum=1c7bb9a346f94a0b6ba783d71df7d21ce021b2f179f5c1a2ebf870366d53ed56 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool" -depends="mplayer" +depends="mplayer desktop-file-utils" makedepends=" glib-devel enca-devel libxml2-devel libdvdread-devel gtk+ vorbis-tools lame-devel libtheora-devel GConf-devel diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index b8fc8a628e..be3e0e8514 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=2.1.5 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --disable-lua --disable-live555 --disable-fluidsynth @@ -20,7 +20,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 libpng-devel>=1.6 libupnp-devel - ncurses-devel libvorbis-devel x264-devel>=20131007.2245_2 ffmpeg-devel>=2.1 + ncurses-devel libvorbis-devel x264-devel>=20140928 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 libmpeg2-devel libflac-devel>=1.3.0 fribidi-devel freetype-devel libproxy-devel