From 1ffabe284d9f5a4ac055941d9817af71be1e5b54 Mon Sep 17 00:00:00 2001 From: Parabola Date: Wed, 15 Feb 2012 20:35:57 +0000 Subject: Wed Feb 15 20:35:56 UTC 2012 --- testing/vlc/PKGBUILD | 80 --------- testing/vlc/vlc-1.1.13-skin2_theme_loader.patch | 29 ---- testing/vlc/vlc-1.1.13-youtube.patch | 221 ------------------------ testing/vlc/vlc.install | 18 -- 4 files changed, 348 deletions(-) delete mode 100644 testing/vlc/PKGBUILD delete mode 100644 testing/vlc/vlc-1.1.13-skin2_theme_loader.patch delete mode 100644 testing/vlc/vlc-1.1.13-youtube.patch delete mode 100644 testing/vlc/vlc.install (limited to 'testing/vlc') diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD deleted file mode 100644 index 7eec6e572..000000000 --- a/testing/vlc/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 149139 2012-02-05 21:34:59Z ibiru $ -# Maintainer: Giovanni Scafora -# Contributor: Sarah Hay -# Contributor: Martin Sandsmark - -pkgname=vlc -pkgver=1.1.13 -pkgrel=6 -pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" -arch=('i686' 'x86_64') -url="http://www.videolan.org/vlc/" -license=('GPL') -depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' 'xcb-util-keysyms' - 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') -makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' - 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' - 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' - 'lirc-utils' 'gnutls' 'libcaca') -optdepends=('avahi: for service discovery using bonjour protocol' - 'libnotify: for notification plugin' - 'ncurses: for ncurses interface support' - 'libdvdcss: for decoding encrypted DVDs' - 'lirc-utils: for lirc plugin' - 'libavc1394: for devices using the 1394ta AV/C' - 'libdc1394: for IEEE 1394 plugin' - 'kdelibs: KDE Solid hardware integration' - 'libpulse: PulseAudio support' - 'vdpau-video: vdpau back-end for nvidia' - 'libva-driver-intel: back-end for intel cards') -conflicts=('vlc-plugin') -replaces=('vlc-plugin') -backup=('usr/share/vlc/http/.hosts' - 'usr/share/vlc/http/dialogs/.hosts' - 'usr/share/vlc/lua/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" - '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 \ - --disable-rpath \ - --enable-faad \ - --enable-v4l \ - --enable-snapshot \ - --enable-dbus-control \ - --enable-nls \ - --enable-lirc \ - --enable-pvr \ - --enable-ncurses \ - --with-live555-tree=/usr/lib/live \ - --enable-upnp \ - --enable-realrtsp - make -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}/" install - - for res in 16 32 48 128; do - install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ - "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" - done -} diff --git a/testing/vlc/vlc-1.1.13-skin2_theme_loader.patch b/testing/vlc/vlc-1.1.13-skin2_theme_loader.patch deleted file mode 100644 index 5230b6485..000000000 --- a/testing/vlc/vlc-1.1.13-skin2_theme_loader.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 deleted file mode 100644 index e1a0f49b4..000000000 --- a/testing/vlc/vlc-1.1.13-youtube.patch +++ /dev/null @@ -1,221 +0,0 @@ ---- 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 diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install deleted file mode 100644 index dc4961cae..000000000 --- a/testing/vlc/vlc.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/vlc/plugins/plugins-*.dat -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} -- cgit v1.2.3-54-g00ecf