diff options
23 files changed, 0 insertions, 1146 deletions
diff --git a/community/gmrun/ChangeLog b/community/gmrun/ChangeLog deleted file mode 100644 index 811f87d4f..000000000 --- a/community/gmrun/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-06-28 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community/gnash/gentoo-ffmpeg-0.8.patch b/community/gnash/gentoo-ffmpeg-0.8.patch deleted file mode 100644 index d74bcc8e0..000000000 --- a/community/gnash/gentoo-ffmpeg-0.8.patch +++ /dev/null @@ -1,204 +0,0 @@ -diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp ---- gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 -+++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-10-31 17:25:56.057379760 +0100 -@@ -29,7 +29,7 @@ - - //#define GNASH_DEBUG_AUDIO_DECODING - --#define AVCODEC_DECODE_AUDIO avcodec_decode_audio2 -+#define AVCODEC_DECODE_AUDIO avcodec_decode_audio3 - - namespace gnash { - namespace media { -@@ -549,8 +549,12 @@ - #endif - - // older ffmpeg versions didn't accept a const input.. -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = (uint8_t*) input; -+ pkt.size = inputSize; - int tmp = AVCODEC_DECODE_AUDIO(_audioCodecCtx, outPtr, &outSize, -- input, inputSize); -+ &pkt); - - #ifdef GNASH_DEBUG_AUDIO_DECODING - log_debug(" avcodec_decode_audio[2](ctx, bufptr, %d, input, %d) " -@@ -658,13 +662,13 @@ - { - if ( _needsParsing ) - { -- return av_parser_parse(_parser, _audioCodecCtx, -+ return av_parser_parse2(_parser, _audioCodecCtx, - // as of 2008-10-28 SVN, ffmpeg doesn't - // accept a pointer to pointer to const.. - const_cast<boost::uint8_t**>(outFrame), - outFrameSize, - input, inputSize, -- 0, 0); // pts & dts -+ 0, 0, AV_NOPTS_VALUE); // pts & dts - } - else - { -diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp ---- gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 -+++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-10-31 17:25:51.210668136 +0100 -@@ -46,8 +46,10 @@ - { - if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) { - if ( ! _context ) { -- _context = audio_resample_init( -- 2, ctx->channels, 44100, ctx->sample_rate -+ _context = av_audio_resample_init( -+ 2, ctx->channels, 44100, ctx->sample_rate, -+ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, -+ 16, 10, 0, 0.8 - ); - } - -diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp ---- gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-10-31 17:25:57.720728522 +0100 -@@ -387,7 +387,7 @@ - - log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d", - _inputFmt->name, _formatCtx->nb_streams); -- -+ /* - if ( _formatCtx->title[0] ) - log_debug(_(" Title:'%s'"), _formatCtx->title); - if ( _formatCtx->author[0] ) -@@ -398,7 +398,7 @@ - log_debug(_(" Comment:'%s'"), _formatCtx->comment); - if ( _formatCtx->album[0] ) - log_debug(_(" Album:'%s'"), _formatCtx->album); -- -+ */ - // Find first audio and video stream - for (unsigned int i = 0; i < static_cast<unsigned int>(_formatCtx->nb_streams); i++) - { -@@ -415,7 +415,7 @@ - } - - switch (enc->codec_type) { -- case CODEC_TYPE_AUDIO: -+ case AVMEDIA_TYPE_AUDIO: - if (_audioStreamIndex < 0) { - _audioStreamIndex = i; - _audioStream = _formatCtx->streams[i]; -@@ -425,7 +425,7 @@ - } - break; - -- case CODEC_TYPE_VIDEO: -+ case AVMEDIA_TYPE_VIDEO: - if (_videoStreamIndex < 0) { - _videoStreamIndex = i; - _videoStream = _formatCtx->streams[i]; -diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp ---- gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-10-31 17:25:54.590699488 +0100 -@@ -356,8 +356,12 @@ - - int bytes = 0; - // no idea why avcodec_decode_video wants a non-const input... -- avcodec_decode_video(_videoCodecCtx->getContext(), frame, &bytes, -- input, input_size); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = (uint8_t*) input; -+ pkt.size = input_size; -+ avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes, -+ &pkt); - - if (!bytes) { - log_error("Decoding of a video frame failed"); -diff -u -Nr gnash-0.8.9/macros/ffmpeg.m4 gnash-0.8.9-ff/macros/ffmpeg.m4 ---- gnash-0.8.9/macros/ffmpeg.m4 2011-02-26 19:11:08.000000000 +0100 -+++ gnash-0.8.9-ff/macros/ffmpeg.m4 2011-10-31 17:25:49.700654130 +0100 -@@ -22,6 +22,7 @@ - backupLIBS="$LIBS" - backupCFLAGS="$CFLAGS" - avcodec_h="" -+ avcodec_version_h="" - ffmpeg_top_incl="" - - dnl If the user specify an path to include headers from, we assume it's the full -@@ -46,6 +47,9 @@ - else - AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header]) - fi -+ if test -f ${with_ffmpeg_incl}/version.h; then -+ avcodec_version_h=${with_ffmpeg_incl}/version.h -+ fi - fi - ]) - -@@ -66,6 +70,9 @@ - if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then - ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`" - avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h" -+ if test -f ${ffmpeg_top_incl}/${i}/version.h; then -+ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h -+ fi - break - fi - done -@@ -83,6 +90,9 @@ - if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then - ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`" - avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h -+ if test -f ${ffmpeg_top_incl}/${i}/version.h; then -+ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h -+ fi - break - fi - done -@@ -182,14 +192,24 @@ - dnl a modified form of grepping may be better, making sure all old kinds of - dnl version numbering fail gracefully. - -+ versionfile="" -+ - dnl Check avcodec version number, if it was found -- if test x"${avcodec_h}" != x; then -+ if test x"${avcodec_version_h}" != x; then -+ versionfile=${avcodec_version_h} -+ else -+ if test x"${avcodec_h}" != x; then -+ versionfile=${avcodec_h} -+ fi -+ fi -+ -+ if test x"${versionfile}" != x; then - - AC_MSG_CHECKING([ffmpeg version]) - -- ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` -- ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` -- ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` -+ ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` -+ ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` -+ ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"` - - if test x"${ffmpeg_major_version}" != x ; then - -@@ -198,15 +218,15 @@ - else - - dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1 -- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"` -+ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"` - - if test x"${ffmpeg_version}" = x ; then - - dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix -- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` -+ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` - - if test x"${ffmpeg_version}" = x ; then -- ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'` -+ ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'` - fi - fi - diff --git a/community/gnash/xul8.patch b/community/gnash/xul8.patch deleted file mode 100644 index 7bd708b2d..000000000 --- a/community/gnash/xul8.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -u -r gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp ---- gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-11-18 16:25:55.198007371 +0100 -@@ -238,7 +238,7 @@ - return NS_PluginInitialize(); - } - --char * -+const char * - NP_GetMIMEDescription(void) - { - return NPP_GetMIMEDescription(); -diff -u -r gnash-0.8.9/plugin/npapi/plugin.cpp gnash-0.8.9-xul/plugin/npapi/plugin.cpp ---- gnash-0.8.9/plugin/npapi/plugin.cpp 2011-03-18 14:44:30.000000000 +0100 -+++ gnash-0.8.9-xul/plugin/npapi/plugin.cpp 2011-11-18 16:35:42.496794816 +0100 -@@ -128,10 +128,10 @@ - } - - /// \brief Return the MIME Type description for this plugin. --char* -+const char* - NPP_GetMIMEDescription(void) - { -- return const_cast<char *>(MIME_TYPES_DESCRIPTION); -+ return MIME_TYPES_DESCRIPTION; - } - - static bool waitforgdb = false; -diff -u -r gnash-0.8.9/plugin/npapi/test.cpp gnash-0.8.9-xul/plugin/npapi/test.cpp ---- gnash-0.8.9/plugin/npapi/test.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-xul/plugin/npapi/test.cpp 2011-11-18 16:37:06.997539299 +0100 -@@ -408,10 +408,10 @@ - { - } - --char* -+const char* - NPP_GetMIMEDescription(void) - { -- char *x = 0; -+ const char *x = 0; - return x; - } - diff --git a/community/librsync/ChangeLog b/community/librsync/ChangeLog deleted file mode 100644 index 4cdab3f13..000000000 --- a/community/librsync/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-28 tardo <tardo@nagi-fanboi.net> -* Recompiled with --with-pic to fix relocation errors diff --git a/community/parano/ChangeLog b/community/parano/ChangeLog deleted file mode 100644 index 07fc29421..000000000 --- a/community/parano/ChangeLog +++ /dev/null @@ -1,6 +0,0 @@ -2007-06-28 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 -* Changed patch to fix Makefile.in and not .am - -2007-08-29 Georg Grabler (STiAT) <ggrabler@gmail.com> -* Updated to version 0.3.4 diff --git a/community/parano/PKGBUILD b/community/parano/PKGBUILD deleted file mode 100644 index 5f773d17c..000000000 --- a/community/parano/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 27187 2010-09-18 15:58:45Z schuay $ -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=parano -pkgver=0.3.5 -pkgrel=4 -pkgdesc="A GNOME frontend for creating/editing/checking MD5 and SFV files" -arch=('i686' 'x86_64') -url="http://parano.berlios.de" -license=('GPL') -depends=('gnome-python' 'shared-mime-info') -makedepends=('intltool') -install=parano.install -source=(http://download.berlios.de/parano/parano-${pkgver}.tar.gz \ - mime.diff) -md5sums=('126cc42492c1dcf4c5e1b4a3c616acb6' \ - '6dd541ece566505e61f6e94c91a26798') - -build() { - cd ${srcdir}/parano-${pkgver} - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - patch -Np0 -i ../mime.diff - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/parano-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community/parano/mime.diff b/community/parano/mime.diff deleted file mode 100644 index c775e06ad..000000000 --- a/community/parano/mime.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- mime/Makefile.in 2006-07-13 19:10:58.000000000 +0200 -+++ mime/Makefile.in.new 2007-08-29 20:16:12.000000000 +0200 -@@ -407,9 +407,9 @@ - uninstall-mimeinfoDATA - - --@UPDATE_MIME_DATABASE_TRUE@install-data-local: --@UPDATE_MIME_DATABASE_TRUE@ mkdir -p $(mimedir) --@UPDATE_MIME_DATABASE_TRUE@ update-mime-database $(datadir)/mime/ -+#@UPDATE_MIME_DATABASE_TRUE@install-data-local: -+#@UPDATE_MIME_DATABASE_TRUE@ mkdir -p $(mimedir) -+#@UPDATE_MIME_DATABASE_TRUE@ update-mime-database $(datadir)/mime/ - - @UPDATE_MIME_DATABASE_TRUE@uninstall-local: - @UPDATE_MIME_DATABASE_TRUE@ update-mime-database $(datadir)/mime/ diff --git a/community/parano/parano.install b/community/parano/parano.install deleted file mode 100644 index 5e31d3635..000000000 --- a/community/parano/parano.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/scrotwm/LICENSE b/community/scrotwm/LICENSE deleted file mode 100644 index 24c04f3a0..000000000 --- a/community/scrotwm/LICENSE +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> - * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -/* - * Much code and ideas taken from dwm under the following license: - * MIT/X Consortium License - * - * 2006-2008 Anselm R Garbe <garbeam at gmail dot com> - * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com> - * 2006-2007 Jukka Salmi <jukka at salmi dot ch> - * 2007 Premysl Hruby <dfenze at gmail dot com> - * 2007 Szabolcs Nagy <nszabolcs at gmail dot com> - * 2007 Christof Musik <christof at sendfax dot de> - * 2007-2008 Enno Gottox Boland <gottox at s01 dot de> - * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com> - * 2008 Martin Hurton <martin dot hurton at gmail dot com> - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD deleted file mode 100644 index e12c4fd3c..000000000 --- a/community/scrotwm/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 64135 2012-02-09 01:36:06Z kkeen $ -# Maintainer: Kyle Keen <keenerd@gmail.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=scrotwm -pkgver=0.11.0 -pkgrel=1 -pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way." -arch=('i686' 'x86_64') -url="http://www.scrotwm.org" -license=('custom:ISC') -depends=('dmenu' 'libxrandr' 'libxtst' 'profont') -makedepends=('libxt') -optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font') -backup=(etc/scrotwm.conf) -source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ - LICENSE \ - baraction.sh) -md5sums=('cf8a0ebc43d0da102db2f75037a6b5df' - 'a67cfe51079481e5b0eab1ad371379e3' - '6132ba773ee00f39d8f67ac0347a9814') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # it is like a patch, only less fragile - sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' scrotwm.c - sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' scrotwm.c - sed -i 's/# modkey = Mod1/modkey = Mod4/' scrotwm.conf - sed -i 's/-\*-terminus-medium-\*-\*-\*-\*-\*-\*-\*-\*-\*-\*-\*/-*-profont-*-*-*-*-12-*-*-*-*-*-*-*/' scrotwm.conf - - cd linux - make PREFIX="/usr" -} - -package() { - cd "$srcdir/$pkgname-$pkgver/linux" - make PREFIX="/usr" DESTDIR="$pkgdir" install - install -Dm644 scrotwm.desktop "$pkgdir/usr/share/xsessions/scrotwm.desktop" - cd .. - install -Dm644 scrotwm.conf "$pkgdir/etc/scrotwm.conf" - install -Dm755 screenshot.sh "$pkgdir/usr/share/scrotwm/screenshot.sh" - cd "$srcdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm755 baraction.sh "$pkgdir/usr/share/scrotwm/baraction.sh" - - ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" - ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" - - # fix this for real in the makefile - mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/ - mv "$pkgdir/usr/share/man/man1/scrotwm_es.1" "$pkgdir/usr/share/man/es/man1/" - mv "$pkgdir/usr/share/man/man1/scrotwm_it.1" "$pkgdir/usr/share/man/it/man1/" - mv "$pkgdir/usr/share/man/man1/scrotwm_pt.1" "$pkgdir/usr/share/man/pt/man1/" - mv "$pkgdir/usr/share/man/man1/scrotwm_ru.1" "$pkgdir/usr/share/man/ru/man1/" -} diff --git a/community/scrotwm/baraction.sh b/community/scrotwm/baraction.sh deleted file mode 100755 index 9c4600adc..000000000 --- a/community/scrotwm/baraction.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -# baraction.sh for scrotwm status bar -# From http://wiki.archlinux.org/index.php/Scrotwm - -SLEEP_SEC=5 -#loops forever outputting a line every SLEEP_SEC secs -while :; do - - eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -) - eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -) - - BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l` - BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l` - BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a" - BAT_PCT=`echo $BCSCRIPT | bc -l`% - - case $BAT_PRESENT in - no) - POWER_STR="AC, NO BATTERY" - ;; - yes) - - case $BAT_CHGSTATE in - charged) - #on ac - AC_STATUS="ON AC" - TIME_REMNG="N/A" - POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT" - ;; - charging) - #on ac - AC_STATUS="ON AC" - BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a" - TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l` - POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min" - ;; - discharging) - AC_STATUS="ON BATT" - TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l` - TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l` - - TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l` - POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM - ;; - *) - POWER_STR=$BAT_CHGSTATE - ;; - esac - - ;; - *) - POWER_STR="error" - ;; - esac - - #scrotwm bar_print can't handle UTF-8 characters, such as degree symbol - #Core 0: +67.0°C (crit = +100.0°C) - eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -) - TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD" - - WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }') - eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -) - BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a" - WLAN_QPCT=`echo $BCSCRIPT | bc -l` - WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//` - WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm" - - CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')` - CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')" - - eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo) - MUSED=$(( $MTOT - $MFREE )) - MUSEDPT=$(( ($MUSED * 100) / $MTOT )) - MEM_STR="Mem:${MUSEDPT}%" - - echo -e "$POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" - #alternatively if you prefer a different date format - #DATE_STR=`date +"%H:%M %a %d %b` - #echo -e "$DATE_STR $POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" - - sleep $SLEEP_SEC -done 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/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 <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') -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 <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/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="vp8.0, vorbis"", "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/testing/udev/PKGBUILD b/testing/udev/PKGBUILD deleted file mode 100644 index 531c062d3..000000000 --- a/testing/udev/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 150221 2012-02-15 08:53:37Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Thomas Bächler <thomas@archlinux.org> - -pkgname=udev -pkgver=181 -pkgrel=3 -pkgdesc="The userspace dev tools (udev)" -depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils') -install=udev.install -arch=(i686 x86_64) -license=('GPL') -makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') -source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz - initcpio-hooks-udev - initcpio-install-udev - modprobe.nouevau.conf) -url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" -backup=(etc/udev/udev.conf) -groups=('base') -options=(!makeflags !libtool) - -build() { - cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr \ - --with-rootprefix= \ - --sysconfdir=/etc \ - --libdir=/usr/lib \ - --libexecdir=/lib \ - --with-systemdsystemunitdir=/lib/systemd/system \ - --enable-udev_acl - - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=${pkgdir} install - - # /dev/loop0 is created for convenience, to autoload the module if necessary - # this is no longer needed when util-linux-2.21 is released as /dev/loop-control - # will be used instead. Support for this will go away in a future version of udev - install -d -m755 ${pkgdir}/lib/udev/devices/ - mknod ${pkgdir}/lib/udev/devices/loop0 b 7 0 - chgrp disk ${pkgdir}/lib/udev/devices/loop0 - - # udevd moved, symlink to make life easy for restarting udevd manually - ln -s /lib/udev/udevd ${pkgdir}/usr/bin/udevd - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - for i in $pkgdir/lib/udev/rules.d/*.rules; do - sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; - s#GROUP="tape"#GROUP="storage"#g; - s#GROUP="cdrom"#GROUP="optical"#g' $i - done - - # nouveau still conflicts with some other standard kernel modules, should go away soon - install -D -m644 ../modprobe.nouevau.conf ${pkgdir}/lib/modprobe.d/nouveau.conf - - # install the mkinitpcio hook - install -D -m644 ../initcpio-hooks-udev ${pkgdir}/lib/initcpio/hooks/udev - install -D -m644 ../initcpio-install-udev ${pkgdir}/lib/initcpio/install/udev -} -md5sums=('0d7af750702620a871b9f9b98d8ad859' - 'a4dd853050bf2e0ae6b2e3d2c75499c2' - 'ee0bfe91a20fff12cc25ab1d1e024853' - '633dabda1fbfa4b6fe4dab5452b40fed') diff --git a/testing/udev/initcpio-hooks-udev b/testing/udev/initcpio-hooks-udev deleted file mode 100644 index 87aa7960f..000000000 --- a/testing/udev/initcpio-hooks-udev +++ /dev/null @@ -1,9 +0,0 @@ -# vim: set ft=sh: -run_hook () -{ - msg -n ":: Triggering uevents..." - udevadm trigger --action=add --type=subsystems - udevadm trigger --action=add --type=devices - udevadm settle - msg "done." -} diff --git a/testing/udev/initcpio-install-udev b/testing/udev/initcpio-install-udev deleted file mode 100644 index e7e2c0f60..000000000 --- a/testing/udev/initcpio-install-udev +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -build() { - FILES="/etc/udev/udev.conf" - SCRIPT="udev" - - add_binary /lib/udev/udevd - add_binary /usr/bin/udevadm - - for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do - add_file "/lib/udev/rules.d/$rules" - done - for tool in ata_id scsi_id; do - add_file "/lib/udev/$tool" - done -} - -help() { - cat <<HELPEOF -This hook will use udev to create your root device node and detect the needed -modules for your root device. It is also required for firmware loading in -initramfs. It is recommended to use this hook. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/udev/modprobe.nouevau.conf b/testing/udev/modprobe.nouevau.conf deleted file mode 100644 index 265f033ab..000000000 --- a/testing/udev/modprobe.nouevau.conf +++ /dev/null @@ -1,7 +0,0 @@ -# The following modules conflict with nouveau -# They will probably soon be disabled from the stock kernel -# config, and this file will go away. -# See <http://nouveau.freedesktop.org/wiki/KernelModeSetting> -# -blacklist nvidiafb -blacklist rivafb diff --git a/testing/udev/udev.install b/testing/udev/udev.install deleted file mode 100644 index 58d1111fb..000000000 --- a/testing/udev/udev.install +++ /dev/null @@ -1,55 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_upgrade() { - if [ "$(vercmp $2 181)" -lt 0 ]; then - echo "udev changes:" - if [ "$(vercmp $2 168)" -lt 0 ]; then - echo " * Kernel 2.6.32 or newer is now required." - echo " * OSS emulation modules are not loaded by default, add to rc.conf if needed." - echo " * Arch specific cd symlinks are now no longer created." - echo " * cd and net persistent rules will no longer be autogenerated," - echo " see <https://wiki.archlinux.org/index.php/Udev> for details." - echo " * Errors are now logged (possibly to the console) by default." - fi - if [ "$(vercmp $2 171)" -lt 0 ]; then - echo " * Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and" - echo " blacklisting in MODULES no longer works." - echo " See 'man modprobe.conf' for a replacement to blacklisting." - echo " To disable a module mod1 on the kernel command line, use" - echo " mod1.disable=1" - echo " or" - echo " modprobe.blacklist=mod1" - echo " * The following modules are no longer unconditionally loaded:" - echo " pcspkr irtty-sir analog lp ppdev ide-generic" - echo " Add them to MODULES in rc.conf if you need them." - fi - if [ "$(vercmp $2 172)" -lt 0 ]; then - echo " * Blacklisting of framebuffer devices has moved from /etc/modprobe.d to" - echo " /lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it" - echo " takes precedence." - echo " * kbd and rtc devices are no longer world readable." - echo " * rtc is no longer in the audio group and fb devices are no longer in" - echo " the video group, as permissions and ownership of fb devices are controlled" - echo " by X." - fi - if [ "$(vercmp $2 174)" -lt 0 ]; then - echo " * We now use upstream rules for assigning devices to the 'disk', 'optical'," - echo " 'scanner' and 'video' groups. Beware of any changes." - echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0." - echo " * For security reasons, we no longer add devices to the 'storage' group. Use" - echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" - echo " this functionality back." - echo " * We no longer create the static nodes on install needed for an initrd-less" - echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh" - echo " installs." - fi - if [ "$(vercmp $2 175)" -lt 0 ]; then - echo " * devtmpfs support is now a hard requirement. Users of the official Arch" - echo " kernels have this enabled." - fi - echo " * udev-compat has been removed, and should be uninstalled." - echo " * Framebuffers are no longer blacklisted by default." - echo " * binaries moved from /sbin to /usr/bin" - fi -} |