From de078a89b9e3a45b6b2e3f0c9d866962e5125ba3 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 Feb 2012 23:15:07 +0000 Subject: Fri Feb 3 23:15:07 UTC 2012 --- testing/feh/PKGBUILD | 6 +- testing/foobillard++/PKGBUILD | 38 ++++ testing/gimp/PKGBUILD | 19 +- testing/libpng/PKGBUILD | 6 +- testing/libwebkit/PKGBUILD | 24 +-- testing/php/PKGBUILD | 6 +- testing/vlc/PKGBUILD | 14 +- testing/vlc/vlc-1.1.13-skin2_theme_loader.patch | 29 ++++ testing/vlc/vlc-1.1.13-youtube.patch | 221 ++++++++++++++++++++++++ 9 files changed, 326 insertions(+), 37 deletions(-) create mode 100644 testing/foobillard++/PKGBUILD create mode 100644 testing/vlc/vlc-1.1.13-skin2_theme_loader.patch create mode 100644 testing/vlc/vlc-1.1.13-youtube.patch (limited to 'testing') diff --git a/testing/feh/PKGBUILD b/testing/feh/PKGBUILD index 5227a7524..7602f6744 100644 --- a/testing/feh/PKGBUILD +++ b/testing/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148093 2012-01-30 18:45:32Z ibiru $ +# $Id: PKGBUILD 148520 2012-02-03 01:14:17Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andrea Scarpino # Contributor: dorphell # Contributor: Tom Newsom pkgname=feh -pkgver=2.2 +pkgver=2.3 pkgrel=2 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('655db5f558cdb268ff55cb088994d78331bd39aa') +sha1sums=('9f42ba920baeb405777f834546223a9ff9eb43e7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/foobillard++/PKGBUILD b/testing/foobillard++/PKGBUILD new file mode 100644 index 000000000..1debfca9a --- /dev/null +++ b/testing/foobillard++/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 148501 2012-02-02 20:08:26Z eric $ +# Maintainer: Eric Bélanger + +pkgname=foobillard++ +pkgver=3.42beta +pkgrel=3 +pkgdesc="An OpenGL billiard game" +arch=('i686' 'x86_64') +url="http://foobillardplus.sourceforge.net/" +license=('GPL2') +depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer') +replaces=('foobillard') +source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz) +sha1sums=('51507efab0f595cfff26149003faf669c0a42f32') + +build() { + cd "${srcdir}/foobillardplus-${pkgver}" + sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop + sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop + aclocal --force + autoconf -f + autoheader -f + automake -a -c -f + ./configure --prefix=/usr/share + make +} + +package() { + cd "${srcdir}/foobillardplus-${pkgver}" + make DESTDIR="${pkgdir}" datadir="${pkgdir}/usr/share/foobillardplus/data" \ + prefix="${pkgdir}/usr/share" install + + install -d "${pkgdir}"/usr/{bin,share/{applications,pixmaps}} + mv "${pkgdir}"/usr/share/{AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO} "${pkgdir}/usr/share/foobillardplus" + mv "${pkgdir}"/usr/share/foobillardplus.desktop "${pkgdir}"/usr/share/applications + mv "${pkgdir}"/usr/share/foobillardplus.{png,xbm} "${pkgdir}"/usr/share/pixmaps + ln -s /usr/share/foobillardplus/bin/foobillardplus "${pkgdir}"/usr/bin/foobillardplus +} diff --git a/testing/gimp/PKGBUILD b/testing/gimp/PKGBUILD index ee911ffd7..8f14a02ad 100644 --- a/testing/gimp/PKGBUILD +++ b/testing/gimp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148115 2012-01-30 18:46:22Z ibiru $ +# $Id: PKGBUILD 148478 2012-02-02 08:21:50Z eric $ # Maintainer: tobias pkgname=gimp -pkgver=2.6.11 -pkgrel=8 +pkgver=2.6.12 +pkgrel=1 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64') url="http://www.gimp.org/" @@ -20,20 +20,15 @@ options=('!libtool' '!makeflags') conflicts=('gimp-devel') install=gimp.install source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl - uri-backend-libcurl.patch gimp-poppler-0.18.patch libpng_compile.patch) -sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c' + uri-backend-libcurl.patch) +sha1sums=('82964e3d4eb003239f3443a1bccac53f5d780e15' '110ce9798173b19a662d086ed7b882b4729f06cf' - 'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4' - '1479a6d80be7adf74f66a3b88057a5029fe892e8' - '5ce329d2e2cb136e93f16117fa79ab6e31866f68') + 'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 < ../uri-backend-libcurl.patch - patch -p1 < ../gimp-poppler-0.18.patch - patch -p1 < ../libpng_compile.patch - PYTHON=/usr/bin/python2 LIBS+="-lgobject-2.0 -lglib-2.0 -lm" \ - ./configure --prefix=/usr --sysconfdir=/etc \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --enable-mp --enable-gimp-console --enable-gimp-remote \ --enable-python --with-gif-compression=lzw --with-libcurl \ --without-aa --without-hal --without-gvfs --without-gnomevfs diff --git a/testing/libpng/PKGBUILD b/testing/libpng/PKGBUILD index d0d182d8c..a87bf974f 100644 --- a/testing/libpng/PKGBUILD +++ b/testing/libpng/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148211 2012-01-30 18:48:21Z ibiru $ +# $Id: PKGBUILD 148513 2012-02-02 22:26:40Z ibiru $ # Maintainer: Jan de Groot # Contributor: dorphell # Contributor: Travis Willard # Contributor: Douglas Soares de Andrade pkgname=libpng -pkgver=1.5.7 +pkgver=1.5.8 _apngver=1.5.7 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" @@ -16,7 +16,7 @@ depends=('zlib' 'sh') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") -md5sums=('c3ae9ce4e81ec0aafdd4ac961586ee0d' +md5sums=('0f7ae352beadaff78073733905613041' '6c6a674048cec94db1bc35decf0d142c') build() { diff --git a/testing/libwebkit/PKGBUILD b/testing/libwebkit/PKGBUILD index f363e2428..e7b30f287 100644 --- a/testing/libwebkit/PKGBUILD +++ b/testing/libwebkit/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 148223 2012-01-30 18:48:38Z ibiru $ +# $Id: PKGBUILD 148493 2012-02-02 15:30:16Z ibiru $ # Maintainer: Andreas Radke pkgbase=libwebkit pkgname=(libwebkit libwebkit3) -pkgver=1.6.1 -pkgrel=2 +pkgver=1.6.3 +pkgrel=1 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64') url="http://webkitgtk.org/" license=('custom') depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant') -makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') +makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') options=('!libtool' '!emptydirs') install=libwebkit.install -source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz) -md5sums=('c11743694b1b71dad287b2e7a9e73b05') +source=(http://webkitgtk.org/webkit-$pkgver.tar.xz) +sha256sums=('12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3') build() { - cd "${srcdir}/webkit-${pkgver}" + cd "$srcdir/webkit-$pkgver" mkdir build-gtk{2,3} ( cd build-gtk2 && _build --with-gtk=2.0 ) @@ -27,7 +27,7 @@ build() { _build() { PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ --enable-introspection \ - --with-font-backend=freetype --enable-gtk-doc \ + --with-font-backend=freetype \ --with-unicode-backend=icu \ --enable-spellcheck "$@" make all stamp-po @@ -39,14 +39,14 @@ package_libwebkit() { cd "$srcdir/webkit-$pkgver/build-gtk2" make DESTDIR="${pkgdir}" install - install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit/LICENSE" + install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE" } package_libwebkit3() { pkgdesc+=" (for GTK3)" depends+=(gtk3) - cd "${srcdir}/webkit-${pkgver}/build-gtk3" - make DESTDIR="${pkgdir}" install - install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE" + cd "$srcdir/webkit-$pkgver/build-gtk3" + make DESTDIR="$pkgdir" install + install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE" } diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD index 3bace4127..5ad593b08 100644 --- a/testing/php/PKGBUILD +++ b/testing/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148255 2012-01-30 18:49:23Z ibiru $ +# $Id: PKGBUILD 148508 2012-02-02 21:31:10Z pierre $ # Maintainer: Pierre Schmitz pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.3.9 +pkgver=5.3.10 _suhosinver=5.3.9-0.9.10 pkgrel=2 arch=('i686' 'x86_64') @@ -36,7 +36,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm') -md5sums=('dd3288ed5c08cd61ac5bf619cb357521' +md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' 'c099b3d7eac95018ababd41ded7f3066' 'c15d18f846be1d69144a5d0056ee6506' 'ffc338e8ce2a990f6f2a486355bbab65' diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD index 4c358d6de..39f54a751 100644 --- a/testing/vlc/PKGBUILD +++ b/testing/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148335 2012-01-30 18:51:20Z ibiru $ +# $Id: PKGBUILD 148497 2012-02-02 17:27:11Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=1.1.13 -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -39,12 +39,18 @@ backup=('usr/share/vlc/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') options=('!libtool') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('9678fb7a04808b6e0de63746d35e4bb1') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'vlc-1.1.13-skin2_theme_loader.patch' + 'vlc-1.1.13-youtube.patch') +md5sums=('9678fb7a04808b6e0de63746d35e4bb1' + 'f7c2ea18da9570d633f5fd834a1f72c8' + '26dbd3574219daf4babc2f127a3229bc') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/vlc-1.1.13-skin2_theme_loader.patch" + patch -Np1 -i "${srcdir}/vlc-1.1.13-youtube.patch" sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c ./configure --prefix=/usr \ diff --git a/testing/vlc/vlc-1.1.13-skin2_theme_loader.patch b/testing/vlc/vlc-1.1.13-skin2_theme_loader.patch new file mode 100644 index 000000000..5230b6485 --- /dev/null +++ b/testing/vlc/vlc-1.1.13-skin2_theme_loader.patch @@ -0,0 +1,29 @@ +--- a/modules/gui/skins2/src/theme_loader.cpp 2012-02-02 17:52:07.000000000 +0100 ++++ b/modules/gui/skins2/src/theme_loader.cpp 2012-02-02 17:52:19.000000000 +0100 +@@ -768,7 +768,7 @@ + { + void *toClose = currentGzVp; + currentGzVp = NULL; currentGzFd = -1; +- return gzclose( toClose ); ++ return gzclose( (gzFile) toClose ); + } + return -1; + } +@@ -777,7 +777,7 @@ + { + if( currentGzVp != NULL && fd != -1 ) + { +- return gzread( currentGzVp, p_buffer, i_length ); ++ return gzread( (gzFile) currentGzVp, p_buffer, i_length ); + } + return -1; + } +@@ -786,7 +786,7 @@ + { + if( currentGzVp != NULL && fd != -1 ) + { +- return gzwrite( currentGzVp, const_cast(p_buffer), i_length ); ++ return gzwrite( (gzFile) currentGzVp, const_cast(p_buffer), i_length ); + } + return -1; + } diff --git a/testing/vlc/vlc-1.1.13-youtube.patch b/testing/vlc/vlc-1.1.13-youtube.patch new file mode 100644 index 000000000..e1a0f49b4 --- /dev/null +++ b/testing/vlc/vlc-1.1.13-youtube.patch @@ -0,0 +1,221 @@ +--- a/share/lua/playlist/youtube.lua 2011-08-06 11:30:49.000000000 +0200 ++++ b/share/lua/playlist/youtube.lua 2012-02-02 16:05:32.000000000 +0100 +@@ -1,7 +1,7 @@ + --[[ + $Id$ + +- Copyright © 2007-2009 the VideoLAN team ++ Copyright © 2007-2011 the VideoLAN team + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -24,13 +24,27 @@ + return res + end + +-function get_arturl( path, video_id ) +- if string.match( vlc.path, "iurl=" ) then +- return vlc.strings( get_url_param( vlc.path, "iurl" ) ) ++function get_arturl() ++ local iurl = get_url_param( vlc.path, "iurl" ) ++ if iurl then ++ return iurl + end +- if not arturl then +- return "http://img.youtube.com/vi/"..video_id.."/default.jpg" ++ local video_id = get_url_param( vlc.path, "v" ) ++ if not video_id then ++ return nil ++ end ++ return "http://img.youtube.com/vi/"..video_id.."/default.jpg" ++end ++ ++function get_prefres() ++ local prefres = -1 ++ if vlc.var and vlc.var.inherit then ++ prefres = vlc.var.inherit(nil, "preferred-resolution") ++ if prefres == nil then ++ prefres = -1 ++ end + end ++ return prefres + end + + -- Probe function. +@@ -47,18 +61,17 @@ + return false + end + end +- return ( string.match( vlc.path, "watch%?v=" ) -- the html page +- or string.match( vlc.path, "watch_fullscreen%?video_id=" ) -- the fullscreen page +- or string.match( vlc.path, "p.swf" ) -- the (old?) player url +- or string.match( vlc.path, "jp.swf" ) -- the (new?) player url (as of 24/08/2007) +- or string.match( vlc.path, "player2.swf" ) ) -- another player url ++ return ( string.match( vlc.path, "/watch%?" ) -- the html page ++ or string.match( vlc.path, "/v/" ) -- video in swf player ++ or string.match( vlc.path, "/player2.swf" ) ) -- another player url + end + + -- Parse function. + function parse() +- if string.match( vlc.path, "watch%?v=" ) ++ if string.match( vlc.path, "/watch%?" ) + then -- This is the HTML page's URL +- -- fmt is the format of the video: 18 is HQ (mp4) ++ -- fmt is the format of the video ++ -- (cf. http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs) + fmt = get_url_param( vlc.path, "fmt" ) + while true do + -- Try to find the video's title +@@ -71,27 +84,42 @@ + end + if string.match( line, "= 0 then ++ fmt_list = string.match( line, "\"fmt_list\": \"(.-)\"" ) ++ if fmt_list then ++ for itag,height in string.gmatch( fmt_list, "(%d+)\\/%d+x(%d+)\\/[^,]+" ) do ++ -- Apparently formats are listed in quality ++ -- order, so we take the first one that works, ++ -- or fallback to the lowest quality ++ fmt = itag ++ if tonumber(height) <= prefres then ++ break ++ end ++ end ++ end ++ end + end +- _,_,t = string.find( line, "\"t\": \"(.-)\"" ) +- -- vlc.msg.err( t ) +- -- video_id = string.gsub( line, ".*&video_id:'([^']*)'.*", "%1" ) +- fmt_url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" ) +- if fmt_url_map then ++ ++ url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" ) ++ if url_map then + -- FIXME: do this properly +- fmt_url_map = string.gsub( fmt_url_map, "\\u0026", "&" ) +- for url,itag in string.gmatch( fmt_url_map, "url=([^&,]+).-&itag=(%d+)" ) do ++ url_map = string.gsub( url_map, "\\u0026", "&" ) ++ for url,itag in string.gmatch( url_map, "url=([^&,]+)[^,]*&itag=(%d+)" ) do + -- Apparently formats are listed in quality order, + -- so we can afford to simply take the first one + if not fmt or tonumber( itag ) == tonumber( fmt ) then +@@ -101,75 +129,37 @@ + end + end + end +- -- Also available on non-HTML5 pages: var swfHTML = (isIE) ? " or ++ -- tag; but we don't need it now + end + end + +- if not video_id then +- video_id = get_url_param( vlc.path, "v" ) ++ if not path then ++ vlc.msg.err( "Couldn't extract youtube video URL, please check for updates to this script" ) ++ return { } + end +- arturl = get_arturl( vlc.path, video_id ) + +- if not fmt then +- -- Prefer WebM formats if this is an &html5=True URL +- html5 = get_url_param( vlc.path, "html5" ) +- if html5 == "True" and webm_path then +- path = webm_path +- end ++ if not arturl then ++ arturl = get_arturl() + end + +- if not path then +- if not base_yt_url then +- base_yt_url = "http://youtube.com/" +- end +- if fmt then +- format = "&fmt=" .. fmt +- else +- format = "" +- end +- +- if t then +- path = base_yt_url .. "get_video?video_id="..video_id.."&t="..t..format +- else +- -- This shouldn't happen ... but keep it as a backup. +- path = "http://www.youtube.com/v/"..video_id +- end +- end + return { { path = path; name = name; description = description; artist = artist; arturl = arturl } } + else -- This is the flash player's URL +- if string.match( vlc.path, "title=" ) then +- name = vlc.strings.decode_uri(get_url_param( vlc.path, "title" )) +- end + video_id = get_url_param( vlc.path, "video_id" ) +- arturl = get_arturl( vlc.path, video_id ) ++ if not video_id then ++ _,_,video_id = string.find( vlc.path, "/v/([^?]*)" ) ++ end ++ if not video_id then ++ vlc.msg.err( "Couldn't extract youtube video URL" ) ++ return { } ++ end + fmt = get_url_param( vlc.path, "fmt" ) + if fmt then + format = "&fmt=" .. fmt + else + format = "" + end +- if not string.match( vlc.path, "t=" ) then +- -- This sucks, we're missing "t" which is now mandatory. Let's +- -- try using another url +- return { { path = "http://www.youtube.com/v/"..video_id; name = name; arturl = arturl } } +- end +- return { { path = "http://www.youtube.com/get_video.php?video_id="..video_id.."&t="..get_url_param( vlc.path, "t" )..format; name = name; arturl = arturl } } ++ return { { path = "http://www.youtube.com/watch?v="..video_id..format } } + end + end -- cgit v1.2.3-54-g00ecf