summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/antlr2/PKGBUILD4
-rw-r--r--extra/ispell/ChangeLog6
-rw-r--r--extra/libart-lgpl/art_misc.h-cplusplus.patch35
-rw-r--r--extra/live-media/PKGBUILD25
-rw-r--r--extra/mono-zeroconf/PKGBUILD29
-rw-r--r--extra/phonon-vlc/PKGBUILD4
-rw-r--r--extra/qhull/qhull-2010.1-cmake-install.patch98
-rw-r--r--extra/qhull/qhull-2010.1-overflows.patch50
-rw-r--r--extra/vlc/PKGBUILD31
-rw-r--r--extra/vlc/vlc-1.1.13-skin2_theme_loader.patch29
-rw-r--r--extra/vlc/vlc-1.1.13-youtube.patch221
-rw-r--r--extra/ypbind-mt/PKGBUILD18
-rw-r--r--extra/zsh/PKGBUILD16
13 files changed, 55 insertions, 511 deletions
diff --git a/extra/antlr2/PKGBUILD b/extra/antlr2/PKGBUILD
index b002792bb..ffd001b92 100644
--- a/extra/antlr2/PKGBUILD
+++ b/extra/antlr2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 150679 2012-02-20 03:46:01Z allan $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: George Giorgidze <giorgidze (at) gmail.com>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -6,7 +6,7 @@
pkgbase=antlr2
pkgname=('antlr2' 'python-antlr2')
pkgver=2.7.7
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://www.antlr2.org/"
license=('custom')
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 <eric@archlinux.org>
-
- * 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 <libart_lgpl/art_config.h>
- #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 <fcrozat@mandriva.com>
-+
-+ reviewed by: Dom Lachowicz <cinamod@hotmail.com>
-+
-+ * art_misc.h: Fix header when included in C++.
-+ Patch from Goetz Waschk and Laurent Montel.
-+
- 2007-02-28 Kjartan Maraas <kmaraas@gnome.org>
-
- configure.in: Release 2.3.19
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index c2676c0d9..da40c768c 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149149 2012-02-06 00:27:42Z giovanni $
+# $Id: PKGBUILD 150662 2012-02-19 16:50:59Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=live-media
pkgver=2012.02.04
-pkgrel=1
+pkgrel=2
pkgdesc="A set of C++ libraries for multimedia streaming"
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
@@ -16,11 +16,11 @@ md5sums=('5c9753e027af08c065f156e2a0bec023')
build() {
cd ${srcdir}/live
- sed \
- -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. '"${CFLAGS}"' -fPIC -DSOCKLEN_T/g' \
- -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) '"${LDFLAGS}"' -o/g' \
- -e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \
- -i config.linux
+ sed \
+ -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DSOCKLEN_T/g' \
+ -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \
+ -e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \
+ -i config.linux
./genMakefiles linux
make
}
@@ -29,10 +29,17 @@ package() {
cd ${srcdir}/live
for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
- mkdir -p ${pkgdir}/usr/lib/live/${dir}
- cp -r ${dir}/*.a ${dir}/include ${pkgdir}/usr/lib/live/${dir}
+ mkdir -p ${pkgdir}/usr/lib/
+ install -m644 ${dir}/*.a ${pkgdir}/usr/lib
done
+ for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do
+ mkdir -p ${pkgdir}/usr/include/${dir}
+ install -m644 ${dir}/include/*.hh ${pkgdir}/usr/include/${dir}
+ done
+
+ install -m644 groupsock/include/*.h ${pkgdir}/usr/include/groupsock
+
mkdir -p ${pkgdir}/usr/bin
for testprog in `find testProgs -type f -perm 755`; do
install ${testprog} ${pkgdir}/usr/bin
diff --git a/extra/mono-zeroconf/PKGBUILD b/extra/mono-zeroconf/PKGBUILD
deleted file mode 100644
index 3bd43a6ee..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 <hugo@archlinux.org>
-
-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' 'mips64el')
-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/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index 07db77956..98dcae31c 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150267 2012-02-16 07:53:14Z andrea $
+# $Id: PKGBUILD 150669 2012-02-19 23:09:39Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=phonon-vlc
@@ -11,7 +11,7 @@ license=('LGPL')
depends=('vlc')
makedepends=('cmake' 'automoc4' 'phonon')
provides=('phonon-backend')
-source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.xz")
+source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.xz")
md5sums=('fc5dc2b353fa0d9e428ecfc3c485eb66')
build() {
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 <johannesobermayr@gmx.de>
-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/PKGBUILD b/extra/vlc/PKGBUILD
index 882b93468..76cba4ca8 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150609 2012-02-18 22:53:43Z giovanni $
+# $Id: PKGBUILD 150664 2012-02-19 17:21:32Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
pkgname=vlc
pkgver=2.0.0
-pkgrel=1
+pkgrel=3
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.videolan.org/vlc/"
@@ -16,10 +16,10 @@ depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
'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' 'pkg-config' 'live-media' 'libnotify'
+makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray'
'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
- 'lirc-utils' 'gnutls' 'libcaca')
+ 'lirc-utils' 'gnutls' 'libcaca' 'oss')
optdepends=('avahi: for service discovery using bonjour protocol'
'libnotify: for notification plugin'
'ncurses: for ncurses interface support'
@@ -29,13 +29,14 @@ optdepends=('avahi: for service discovery using bonjour protocol'
'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')
+ 'libva-driver-intel: back-end for intel cards'
+ 'libbluray: for Blu-Ray disks'
+ 'oss: for OSS audio')
[ "$CARCH" = "mips64el" ] && {
-makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify'
+makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray'
'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
- 'gnutls' 'libcaca')
+ 'gnutls' 'libcaca' 'oss')
optdepends=('avahi: for service discovery using bonjour protocol'
'libnotify: for notification plugin'
'ncurses: for ncurses interface support'
@@ -43,7 +44,10 @@ optdepends=('avahi: for service discovery using bonjour protocol'
'libavc1394: for devices using the 1394ta AV/C'
'libdc1394: for IEEE 1394 plugin'
'kdelibs: KDE Solid hardware integration'
- 'libpulse: PulseAudio support')
+ 'libpulse: PulseAudio support'
+ 'libva-driver-intel: back-end for intel cards'
+ 'libbluray: for Blu-Ray disks'
+ 'oss: for OSS audio')
}
conflicts=('vlc-plugin')
replaces=('vlc-plugin')
@@ -63,15 +67,15 @@ build() {
./configure --prefix=/usr \
--disable-rpath \
--enable-faad \
- --enable-v4l \
- --enable-snapshot \
--enable-dbus-control \
--enable-nls \
--disable-lirc \
--enable-pvr \
--enable-ncurses \
- --with-live555-tree=/usr/lib/live \
--enable-upnp \
+ --enable-oss \
+ --enable-bluray \
+ --enable-live555 \
--enable-realrtsp
else
./configure --prefix=/usr \
@@ -83,6 +87,9 @@ build() {
--enable-pvr \
--enable-ncurses \
--enable-upnp \
+ --enable-oss \
+ --enable-bluray \
+ --enable-live555 \
--enable-realrtsp
fi
make
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<void*>(p_buffer), i_length );
-+ return gzwrite( (gzFile) currentGzVp, const_cast<void*>(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, "<meta name=\"description\"" ) then
- -- Don't ask me why they double encode ...
-- _,_,description = vlc.strings.resolve_xml_special_chars(vlc.strings.resolve_xml_special_chars(string.find( line, "content=\"(.-)\"" )))
-+ _,_,description = string.find( line, "content=\"(.-)\"" )
-+ description = vlc.strings.resolve_xml_special_chars( description )
-+ description = vlc.strings.resolve_xml_special_chars( description )
- end
-- if string.match( line, "subscribe_to_user=" ) then
-- _,_,artist = string.find( line, "subscribe_to_user=([^&]*)" )
-+ if string.match( line, "<meta property=\"og:image\"" ) then
-+ _,_,arturl = string.find( line, "content=\"(.-)\"" )
- end
-- -- CURRENT: var swfConfig = { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"};
-- -- OLD 1: var swfArgs = {hl:'en',BASE_YT_URL:'http://youtube.com/',video_id:'XPJ7d8dq0t8',l:'292',t:'OEgsToPDskLFdOYrrlDm3FQPoQBYaCP1',sk:'0gnr-AE6QZJEZmCMd3lq_AC'};
-- -- OLD 2: var swfArgs = { "BASE_YT_URL": "http://youtube.com", "video_id": "OHVvVmUNBFc", "l": 88, "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA", "tk": "mEL4E7PqHeaZp5OG19NQThHt9mXJU4PbRTOw6lz9osHi4Hixp7RE1w=="};
-- -- OLD 3: 'SWF_ARGS': { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"};
-- if ( string.match( line, "PLAYER_CONFIG" ) or string.match( line, "swfConfig" ) or string.match( line, "SWF_ARGS" ) or string.match( line, "swfArgs" ) ) and string.match( line, "video_id" ) then
-- if string.match( line, "BASE_YT_URL" ) then
-- _,_,base_yt_url = string.find( line, "\"BASE_YT_URL\": \"(.-)\"" )
-+ if string.match( line, " rel=\"author\"" ) then
-+ _,_,artist = string.find( line, "href=\"/user/([^\"]*)\"" )
-+ end
-+ -- JSON parameters, also formerly known as "swfConfig",
-+ -- "SWF_ARGS", "swfArgs", "PLAYER_CONFIG" ...
-+ if string.match( line, "playerConfig" ) then
-+ if not fmt then
-+ prefres = get_prefres()
-+ if prefres >= 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) ? "<object [...]><param name=\"flashvars\" value=\"rv.2.thumbnailUrl=http%3A%2F%2Fi4.ytimg.com%2Fvi%2F3MLp7YNTznE%2Fdefault.jpg&rv.7.length_seconds=384 [...] &video_id=OHVvVmUNBFc [...] &t=OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp [...]
-- elseif string.match( line, "swfHTML" ) and string.match( line, "video_id" ) then
-- _,_,t = string.find( line, "&t=(.-)&" )
-- -- Also available in HTML5 pages: videoPlayer.setAvailableFormat("http://v6.lscache4.c.youtube.com/videoplayback?ip=82.0.0.0&sparams=id%2Cexpire%2Cip%2Cipbits%2Citag%2Calgorithm%2Cburst%2Cfactor&algorithm=throttle-factor&itag=45&ipbits=8&burst=40&sver=3&expire=1275688800&key=yt1&signature=6ED860441298D1157FF3013A5D72727F25831F09.4C196BEA9F8F9B83CE678D79AD918B83D5E98B46&factor=1.25&id=7117715cf57d18d4", "video/webm; codecs=&quot;vp8.0, vorbis&quot;", "hd720");
-- elseif string.match( line, "videoPlayer%.setAvailableFormat" ) then
-- url,itag = string.match( line, "videoPlayer%.setAvailableFormat%(\"(.-itag=(%d+).-)\",.+%)" )
-- if url then
-- -- For now, WebM formats are listed only in the HTML5
-- -- section, that is also only when HTML5 is enabled.
-- -- Format 45 is 720p, and 43 is lower resolution.
-- if tonumber( itag ) == 45 or ( tonumber( itag ) == 43 and not webm_path ) then
-- webm_path = url
-- end
-- -- Grab something if fmt_url_map failed
-- if not path and ( not fmt or tonumber( itag ) == tonumber( fmt ) ) then
-- path = url
-- end
-- end
-+ -- There is also another version of the parameters, encoded
-+ -- differently, as an HTML attribute of an <object> or <embed>
-+ -- 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/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD
index 279d11481..03c6f70fb 100644
--- a/extra/ypbind-mt/PKGBUILD
+++ b/extra/ypbind-mt/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 138068 2011-09-15 22:41:35Z tomegun $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# $Id: PKGBUILD 150656 2012-02-19 12:54:57Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=ypbind-mt
pkgver=1.33
-pkgrel=3
+pkgrel=4
pkgdesc='Linux NIS daemon'
url='http://www.linux-nis.org/nis/ypbind-mt/'
license=('GPL2')
@@ -14,14 +15,11 @@ makedepends=('networkmanager')
depends=('rpcbind' 'openslp' 'dbus-glib')
optdepends=('yp-tools: to set a domain name')
backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname')
-source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
+#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
'nisdomainname.conf'
'ypbind.conf'
'ypbind')
-sha1sums=('49f578d15aa5d4f4130a2e96cd9c0e519263fc88'
- 'eb00aecc0679e25a36b007e797f4468b40cb3e8e'
- '07dee386d001fb9e9e6b76dda8af5b2092e5a4a2'
- '112fc2aedfe3f761325b69647b7938bc1be5bfcd')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -44,3 +42,7 @@ package() {
install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname
install -d -m755 "${pkgdir}"/var/yp/binding
}
+md5sums=('692f68ed0476762be4228ce543a5b791'
+ 'e83a85291ea2ee152a78f2c16b0b1185'
+ '229309a989abad27703ac2e6d07dc7ae'
+ '1f7a4c80414d580c9afb3a08267beed0')
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index 14af39a78..f7ccd3810 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149982 2012-02-11 23:31:46Z allan $
+# $Id: PKGBUILD 150666 2012-02-19 20:58:33Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=zsh
-pkgver=4.3.15
-pkgrel=3
+pkgver=4.3.16
+pkgrel=1
pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.zsh.org/'
@@ -11,15 +11,13 @@ license=('custom')
depends=('pcre' 'libcap' 'gdbm')
install=zsh.install
source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
- 'zprofile' 'svn-1.7.patch')
+ 'zprofile')
backup=('etc/zsh/zprofile')
-md5sums=('11766b0dd674a513810903cd33ffcac4'
- '24a9335edf77252a7b5f52e079f7aef7'
- '4fcbc119fdb624a8c483a278f3a82efd')
+md5sums=('4bf0b8947b5acc0ac4334d75adc87239'
+ '24a9335edf77252a7b5f52e079f7aef7')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/svn-1.7.patch"
# FS#16360
sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \
Doc/zsh.texi \
@@ -48,8 +46,6 @@ build() {
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # This test wont work with the noatime mount option
- rm Test/C02cond.ztst
HOME="${srcdir}" make check
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-23 07:09:59 +0000