From 1a09ca56e4f37ac4e995c924c649ede71a5c82aa Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 20 Feb 2012 17:00:00 +0000 Subject: Mon Feb 20 16:59:52 UTC 2012 --- extra/ispell/ChangeLog | 6 - extra/libart-lgpl/art_misc.h-cplusplus.patch | 35 ---- extra/mono-zeroconf/PKGBUILD | 29 ---- extra/qhull/qhull-2010.1-cmake-install.patch | 98 ------------ extra/qhull/qhull-2010.1-overflows.patch | 50 ------ extra/vlc/vlc-1.1.13-skin2_theme_loader.patch | 29 ---- extra/vlc/vlc-1.1.13-youtube.patch | 221 -------------------------- 7 files changed, 468 deletions(-) delete mode 100644 extra/ispell/ChangeLog delete mode 100644 extra/libart-lgpl/art_misc.h-cplusplus.patch delete mode 100644 extra/mono-zeroconf/PKGBUILD delete mode 100644 extra/qhull/qhull-2010.1-cmake-install.patch delete mode 100644 extra/qhull/qhull-2010.1-overflows.patch delete mode 100644 extra/vlc/vlc-1.1.13-skin2_theme_loader.patch delete mode 100644 extra/vlc/vlc-1.1.13-youtube.patch (limited to 'extra') diff --git a/extra/ispell/ChangeLog b/extra/ispell/ChangeLog deleted file mode 100644 index edb12c3bb..000000000 --- a/extra/ispell/ChangeLog +++ /dev/null @@ -1,6 +0,0 @@ -2008-03-31 Eric Belanger - - * ispell 3.3.02-2 - * FSH man pages - * Added ChangeLog - diff --git a/extra/libart-lgpl/art_misc.h-cplusplus.patch b/extra/libart-lgpl/art_misc.h-cplusplus.patch deleted file mode 100644 index dea8eb0a0..000000000 --- a/extra/libart-lgpl/art_misc.h-cplusplus.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: art_misc.h -=================================================================== ---- art_misc.h (revision 277) -+++ art_misc.h (working copy) -@@ -34,9 +34,15 @@ - #include - #endif - -+#ifdef __cplusplus -+extern "C" { -+#endif - void *art_alloc(size_t size); - void art_free(void *ptr); - void *art_realloc(void *ptr, size_t size); -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ - - /* These aren't, strictly speaking, configuration macros, but they're - damn handy to have around, and may be worth playing with for -Index: ChangeLog -=================================================================== ---- ChangeLog (revision 277) -+++ ChangeLog (working copy) -@@ -1,3 +1,10 @@ -+2007-03-01 Frederic Crozat -+ -+ reviewed by: Dom Lachowicz -+ -+ * art_misc.h: Fix header when included in C++. -+ Patch from Goetz Waschk and Laurent Montel. -+ - 2007-02-28 Kjartan Maraas - - configure.in: Release 2.3.19 diff --git a/extra/mono-zeroconf/PKGBUILD b/extra/mono-zeroconf/PKGBUILD deleted file mode 100644 index 6b0728b3f..000000000 --- a/extra/mono-zeroconf/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 94562 2010-10-08 11:54:41Z ibiru $ -# Maintainer: Hugo Doria - -pkgname=mono-zeroconf -pkgver=0.9.0 -pkgrel=2 -pkgdesc="A cross platform Zero Configuration Networking library for Mono and .NET." -url="http://www.mono-project.com/Mono.Zeroconf" -license=('GPL') -arch=('i686' 'x86_64') -depends=('mono>=2.6' 'avahi') -options=('!makeflags') -source=(http://download.banshee-project.org/mono-zeroconf/${pkgname}-${pkgver}.tar.bz2) -md5sums=('cb25d50898442a7766c324dcb52ef9bf') - - -build() { - export MONO_SHARED_DIR=${srcdir}/.wabi - mkdir -p "${MONO_SHARED_DIR}" - - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr --disable-docs --disable-mdnsresponder - make hicolordir=/usr/share/icons/hicolor - make hicolordir=/usr/share/icons/hicolor \ - GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \ - DESTDIR=${pkgdir} install - rm -rf "${MONO_SHARED_DIR}" -} diff --git a/extra/qhull/qhull-2010.1-cmake-install.patch b/extra/qhull/qhull-2010.1-cmake-install.patch deleted file mode 100644 index 9e1914d13..000000000 --- a/extra/qhull/qhull-2010.1-cmake-install.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -Nur qhull-2010.1.orig/CMakeLists.txt qhull-2010.1/CMakeLists.txt ---- qhull-2010.1.orig/CMakeLists.txt 2010-10-03 23:04:04.000000000 +0100 -+++ qhull-2010.1/CMakeLists.txt 2010-10-03 23:26:54.000000000 +0100 -@@ -1,8 +1,44 @@ - project(qhull) --cmake_minimum_required(VERSION 2.4) --if(COMMAND cmake_policy) -- cmake_policy(SET CMP0003 NEW) --endif(COMMAND cmake_policy) -+cmake_minimum_required(VERSION 2.6) -+ -+ -+set(QHULL_VERSION "2010.1") -+ -+if(INCLUDE_INSTALL_DIR) -+else() -+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include) -+endif() -+if(LIB_INSTALL_DIR) -+else() -+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) -+endif() -+if(BIN_INSTALL_DIR) -+else() -+set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) -+endif() -+if(DOC_INSTALL_DIR) -+else() -+set(DOC_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/qhull) -+endif() -+ -+message(STATUS) -+message(STATUS "========== qhull Build Information ==========") -+message(STATUS "Build Version: ${QHULL_VERSION}") -+message(STATUS "Install Prefix (CMAKE_INSTALL_PREFIX): ${CMAKE_INSTALL_PREFIX}") -+message(STATUS "Binary Directory (BIN_INSTALL_DIR): ${BIN_INSTALL_DIR}") -+message(STATUS "Library Directory (LIB_INSTALL_DIR): ${LIB_INSTALL_DIR}") -+message(STATUS "Include Directory (INCLUDE_INSTALL_DIR): ${INCLUDE_INSTALL_DIR}") -+message(STATUS "Documentation Directory (DOC_INSTALL_DIR): ${DOC_INSTALL_DIR}") -+message(STATUS) -+message(STATUS "To change any of these options, override them using -D{OPTION_NAME} on the commandline.") -+message(STATUS "To build and install qhull, run \"make\" and \"make install\"") -+message(STATUS) -+ - - add_subdirectory(src) -+option(WITH_STATIC_LIBS "Build with a static library" OFF) -+option(WITH_DOCS "Install HTML documentation" OFF) - -+if (WITH_DOCS) -+install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR}) -+endif (WITH_DOCS) -diff -Nur qhull-2010.1.orig/src/CMakeLists.txt qhull-2010.1/src/CMakeLists.txt ---- qhull-2010.1.orig/src/CMakeLists.txt 2010-10-03 23:04:04.000000000 +0100 -+++ qhull-2010.1/src/CMakeLists.txt 2010-10-04 00:23:47.000000000 +0100 -@@ -23,8 +23,25 @@ - - file(GLOB qhull_hdr *.h) - --add_library(qhull ${qhull_src}) -+add_library(qhull SHARED ${qhull_src}) - target_link_libraries(qhull m) -+if(UNIX) -+ if(APPLE) -+ set_target_properties(qhull PROPERTIES -+ INSTALL_NAME_DIR "${LIB_INSTALL_DIR}") -+ else(APPLE) -+ set_target_properties(qhull PROPERTIES -+ INSTALL_RPATH "${LIB_INSTALL_DIR}" -+ INSTALL_RPATH_USE_LINK_PATH TRUE -+ BUILD_WITH_INSTALL_RPATH FALSE) -+ endif(APPLE) -+endif(UNIX) -+ -+if(WITH_STATIC_LIBS) -+ add_library(qhullstatic STATIC ${qhull_src}) -+ set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull") -+ install(TARGETS qhullstatic ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) -+endif(WITH_STATIC_LIBS) - - set(qhullcmd_SOURCES unix.c) - set(rbox_SOURCES rbox.c) -@@ -36,6 +53,7 @@ - - add_executable(qhullcmd ${qhullcmd_SOURCES}) - target_link_libraries(qhullcmd qhull) -+set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull") - - add_executable(rbox ${rbox_SOURCES}) - target_link_libraries(rbox qhull) -@@ -52,3 +70,7 @@ - add_executable(qhalf ${qhalf_SOURCES}) - target_link_libraries(qhalf qhull) - -+install(TARGETS qhull qhullcmd rbox qconvex qdelaunay qvoronoi qhalf -+ RUNTIME DESTINATION ${BIN_INSTALL_DIR} -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}) -+install(FILES ${qhull_hdr} DESTINATION ${INCLUDE_INSTALL_DIR}/qhull) diff --git a/extra/qhull/qhull-2010.1-overflows.patch b/extra/qhull/qhull-2010.1-overflows.patch deleted file mode 100644 index df4aa3da1..000000000 --- a/extra/qhull/qhull-2010.1-overflows.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 176c01851026125f574a8223ad49ec58b2b58ec0 Mon Sep 17 00:00:00 2001 -From: Johannes Obermayr -Date: Fri, 23 Jul 2010 20:02:19 +0200 -Subject: [PATCH] Fix some serious compiler warnings causing build breakage on openSUSE. - ---- - src/global.c | 2 +- - src/rboxlib.c | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/global.c b/src/global.c -index 3c6141a..4c9f56c 100644 ---- a/src/global.c -+++ b/src/global.c -@@ -614,7 +614,7 @@ void qh_initflags(char *command) { - if (command <= &qh qhull_command[0] || command > &qh qhull_command[0] + sizeof(qh qhull_command)) { - if (command != &qh qhull_command[0]) { - *qh qhull_command= '\0'; -- strncat( qh qhull_command, command, sizeof( qh qhull_command)); -+ strncat(qh qhull_command, command, sizeof(qh qhull_command)-strlen(qh qhull_command)-1); - } - while (*s && !isspace(*s)) /* skip program name */ - s++; -diff --git a/src/rboxlib.c b/src/rboxlib.c -index 4f11d22..17d01ac 100644 ---- a/src/rboxlib.c -+++ b/src/rboxlib.c -@@ -124,7 +124,7 @@ int qh_rboxpoints(FILE* fout, FILE* ferr, char* rbox_command) { - } - - *command= '\0'; -- strncat(command, rbox_command, sizeof(command)); -+ strncat(command, rbox_command, sizeof(command)-strlen(command)-1); - - while (*s && !isspace(*s)) /* skip program name */ - s++; -@@ -346,8 +346,8 @@ int qh_rboxpoints(FILE* fout, FILE* ferr, char* rbox_command) { - } - }else if (israndom) { - seed= (int)time(&timedata); -- sprintf(seedbuf, " t%d", seed); /* appends an extra t, not worth removing */ -- strncat(command, seedbuf, sizeof(command)); -+ printf(seedbuf, " t%d", seed); /* appends an extra t, not worth removing */ -+ strncat(command, seedbuf, sizeof(command)-strlen(command)-1); - t= strstr(command, " t "); - if (t) - strcpy(t+1, t+3); /* remove " t " */ --- -1.6.1 - diff --git a/extra/vlc/vlc-1.1.13-skin2_theme_loader.patch b/extra/vlc/vlc-1.1.13-skin2_theme_loader.patch deleted file mode 100644 index 5230b6485..000000000 --- a/extra/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/extra/vlc/vlc-1.1.13-youtube.patch b/extra/vlc/vlc-1.1.13-youtube.patch deleted file mode 100644 index e1a0f49b4..000000000 --- a/extra/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 -- cgit v1.2.3-54-g00ecf