diff options
author | root <root@rshg054.dnsready.net> | 2012-11-18 02:17:27 -0800 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-11-18 02:17:27 -0800 |
commit | ab63d8d49f68847a68c2ba0014bf0d3338cb3df6 (patch) | |
tree | 7f0d9cf1b60a9b65a36c3f58ab2164c62cb378f1 /community | |
parent | 071ecd58a9b69020ec170e7f89009a603e885371 (diff) |
Sun Nov 18 02:15:18 PST 2012
Diffstat (limited to 'community')
-rw-r--r-- | community/ettercap/PKGBUILD | 16 | ||||
-rw-r--r-- | community/ettercap/ettercap.desktop | 8 | ||||
-rw-r--r-- | community/expac/PKGBUILD | 7 | ||||
-rw-r--r-- | community/gnome-mplayer/PKGBUILD | 6 | ||||
-rw-r--r-- | community/lmms/PKGBUILD | 18 | ||||
-rw-r--r-- | community/lmms/zynaddsubfx_unlink.patch | 10 | ||||
-rw-r--r-- | community/mplayer2/PKGBUILD | 64 | ||||
-rw-r--r-- | community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch | 31 | ||||
-rw-r--r-- | community/mplayer2/mplayer2-20120729-libquvi-support.patch | 277 | ||||
-rw-r--r-- | community/multipath-tools/PKGBUILD | 8 | ||||
-rw-r--r-- | community/ncmpcpp/PKGBUILD | 10 | ||||
-rw-r--r-- | community/nginx/PKGBUILD | 15 | ||||
-rw-r--r-- | community/openntpd/PKGBUILD | 5 | ||||
-rw-r--r-- | community/openntpd/openntpd.install | 20 | ||||
-rw-r--r-- | community/performous/PKGBUILD | 39 | ||||
-rw-r--r-- | community/pidgin-libnotify/PKGBUILD | 20 | ||||
-rw-r--r-- | community/pidgin-libnotify/pidgin-libnotify-showbutton.patch | 10 | ||||
-rw-r--r-- | community/pkgfile/PKGBUILD | 16 | ||||
-rw-r--r-- | community/pmount/PKGBUILD | 27 | ||||
-rw-r--r-- | community/qingy/PKGBUILD | 15 | ||||
-rw-r--r-- | community/qingy/qingy@.service | 3 |
21 files changed, 495 insertions, 130 deletions
diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD index 417336aaf..42456bae4 100644 --- a/community/ettercap/PKGBUILD +++ b/community/ettercap/PKGBUILD @@ -1,35 +1,34 @@ -# $Id: PKGBUILD 79575 2012-11-07 21:26:51Z jelle $ +# $Id: PKGBUILD 80196 2012-11-17 14:33:46Z jelle $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=ettercap pkgname=('ettercap' 'ettercap-gtk') pkgver=0.7.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') -url="http://ettercap.sourceforge.net/" +url="http://ettercap.github.com/ettercap/" license=('GPL') makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2') options=('!libtool' '!makeflags' '!emptydirs') -source=("http://sourceforge.net/projects/ettercap/files/$pkgbase/$pkgver-Assimilation/$pkgbase-$pkgver.tar.gz") +source=("https://github.com/downloads/Ettercap/$pkgbase/$pkgbase-$pkgver.tar.gz" "ettercap.desktop") md5sums=('ab2354bf9c91195f06ad0b5d058565a4') build() { cd "${srcdir}" -#sed -i 's/su-to-root -c/gksu/' ${pkgbase}-${pkgver}/desktop/ettercap.desktop cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-gtk cd ${pkgbase}-${pkgver} mkdir build cd build - cmake -D ENABLE_GTK=OFF -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../ + cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../ make cd "$srcdir"/${pkgbase}-${pkgver}-gtk mkdir build cd build - cmake -D INSTALL_PREFX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../ + cmake -D ENABLE_GTK=ON -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../ make } @@ -49,4 +48,5 @@ package_ettercap-gtk() { cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk } -md5sums=('037b28cd94efa086a795060fc0f76080') +md5sums=('037b28cd94efa086a795060fc0f76080' + 'f9281fe1735ceba59753bfe442715bb6') diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop new file mode 100644 index 000000000..e2345d91a --- /dev/null +++ b/community/ettercap/ettercap.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Ettercap +Comment=Nework sniffer/analyser +Exec=ettercap-gtk +Icon=ettercap +Terminal=false +Type=Application +Categories=Network; diff --git a/community/expac/PKGBUILD b/community/expac/PKGBUILD index de5ab3177..1bd7be9ad 100644 --- a/community/expac/PKGBUILD +++ b/community/expac/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68721 2012-04-01 00:18:57Z dreisner $ +# $Id: PKGBUILD 80201 2012-11-17 15:05:30Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=expac pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc="pacman database extraction utility" arch=('i686' 'x86_64') url="http://github.com/falconindy/expac" @@ -15,10 +15,13 @@ md5sums=('be8348f18e6af9db250437b14a91e443') build() { make -C "$pkgname-$pkgver" + + sed '/\*\//q' "$pkgname-$pkgver"/expac.c >LICENSE } package() { make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim: ft=sh syn=sh diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD index 2ae3a66c2..8e88f05a2 100644 --- a/community/gnome-mplayer/PKGBUILD +++ b/community/gnome-mplayer/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 79361 2012-11-03 16:29:00Z lfleischer $ +# $Id: PKGBUILD 80171 2012-11-17 12:43:41Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gnome-mplayer pkgver=1.0.7 -pkgrel=1 +pkgrel=2 pkgdesc='A simple MPlayer GUI.' arch=('i686' 'x86_64') url='http://gnome-mplayer.googlecode.com/' license=('GPL') -depends=('mplayer' 'dbus-glib' 'libnotify' 'hicolor-icon-theme' 'dconf' 'gmtk') +depends=('mplayer' 'dbus-glib' 'libnotify' 'gnome-icon-theme' 'hicolor-icon-theme' 'dconf' 'gmtk') makedepends=('gnome-power-manager' 'nautilus') install="${pkgname}.install" source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD index c7ebc3ab3..4d514aa6c 100644 --- a/community/lmms/PKGBUILD +++ b/community/lmms/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66380 2012-02-24 11:46:22Z lfleischer $ +# $Id: PKGBUILD 80173 2012-11-17 12:51:55Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> # Contributor: Mateusz Herych <heniekk@gmail.com> @@ -6,7 +6,7 @@ pkgname=lmms pkgver=0.4.13 -pkgrel=1 +pkgrel=2 pkgdesc='The Linux MultiMedia Studio.' arch=('i686' 'x86_64') url='http://lmms.sourceforge.net/' @@ -17,21 +17,24 @@ optdepends=('wine: VST support (experimental)' 'fftw: SpectrumAnalyzer plugin' 'stk: STK instruments plugins' 'pulseaudio: PulseAudio output') -makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk') -[[ $CARCH = i686 ]] && makedepends+=('wine') +makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk' 'wine') provides=('lmms-extras') conflicts=('lmms-extras') options=('!libtool' '!makeflags') install=lmms.install -source=("http://downloads.sourceforge.net/sourceforge/lmms/${pkgname}-${pkgver}.tar.bz2") -md5sums=('80db0dc5263041d443f474220410991f') +source=("http://downloads.sourceforge.net/sourceforge/lmms/${pkgname}-${pkgver}.tar.bz2" + zynaddsubfx_unlink.patch) +md5sums=('80db0dc5263041d443f474220410991f' + 'd2ea78ac0cf2979505f140c6845617cf') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake - cmake . -DCMAKE_INSTALL_PREFIX=/usr + patch -Np1 -i ../zynaddsubfx_unlink.patch + + cmake . -DCMAKE_INSTALL_PREFIX=/usr -USE=vst make } @@ -39,4 +42,3 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="${pkgdir}" install } - diff --git a/community/lmms/zynaddsubfx_unlink.patch b/community/lmms/zynaddsubfx_unlink.patch new file mode 100644 index 000000000..6b2521f55 --- /dev/null +++ b/community/lmms/zynaddsubfx_unlink.patch @@ -0,0 +1,10 @@ +--- lmms-0.4.13_orig/plugins/zynaddsubfx/LocalZynAddSubFx.cpp 2012-04-08 13:01:25.951925761 +0200 ++++ lmms-0.4.13_test/plugins/zynaddsubfx/LocalZynAddSubFx.cpp 2012-04-08 13:08:32.841905201 +0200 +@@ -23,6 +23,7 @@ + */ + + #include <lmmsconfig.h> ++#include <unistd.h> + + #include "LocalZynAddSubFx.h" + diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 23869f384..0570b3162 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,54 +1,60 @@ -# $Id: PKGBUILD 74686 2012-08-02 07:31:37Z bpiotrowski $ +# $Id: PKGBUILD 80198 2012-11-17 14:50:42Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 pkgver=20120729 -pkgrel=1 -pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project" +pkgrel=2 +pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project' arch=('i686' 'x86_64') license=('GPL') url="http://www.mplayer2.org/" install=$pkgname.install depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss' - 'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libtheora' 'libvdpau' + 'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau' 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') -makedepends=('mesa' 'unzip' 'yasm' 'python') +makedepends=('mesa' 'unzip' 'yasm' 'python' 'python-docutils') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('53a266106f4c0dd687af3f807727812c') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz + mplayer2-20120729-fix-vf_lavc-compilation.patch + mplayer2-20120729-libquvi-support.patch) +md5sums=('53a266106f4c0dd687af3f807727812c' + 'b1e9188001d31b066488aa35401b62bc' + 'd5a23b19d1f84399526bd0dd9bae0e90') build() { - cd "${srcdir}"/$pkgname-$pkgver - - sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop - find -type f -exec sed -e 's/python3/python/' -i {} \; - - ./configure --prefix=/usr --confdir=/etc/mplayer \ - --enable-translation --language=all \ - --enable-runtime-cpudetection \ - --enable-joystick \ - --disable-speex \ - --disable-openal \ - --disable-libdv \ - --disable-musepack \ - --disable-mga - make + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i $srcdir/mplayer2-20120729-libquvi-support.patch + patch -Np1 -i $srcdir/mplayer2-20120729-fix-vf_lavc-compilation.patch + + sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop + find -type f -exec sed -e 's/python3/python/' -i {} \; + + ./configure --prefix=/usr --confdir=/etc/mplayer \ + --enable-translation --language=all \ + --enable-runtime-cpudetection \ + --enable-joystick \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack + make } package() { - cd "${srcdir}"/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install - make DESTDIR="${pkgdir}" install - install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/ - install -dm755 "${pkgdir}"/usr/share/mplayer/ - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf + install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/ + install -dm755 $pkgdir/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf - install -dm755 "${pkgdir}"/usr/share/applications/ - install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/ + install -dm755 $pkgdir/usr/share/applications/ + install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/ } diff --git a/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch b/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch new file mode 100644 index 000000000..a50161305 --- /dev/null +++ b/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch @@ -0,0 +1,31 @@ +From f5e0365c8e76e2ef797027134f1819e613764d7e Mon Sep 17 00:00:00 2001 +From: Anton Khirnov <anton@khirnov.net> +Date: Wed, 19 Sep 2012 12:00:01 +0000 +Subject: vf_lavc: fix compilation with latest libav + +Remove a pointless and broken check for avctx->codec->encode. + +1) The check does not test for anything useful. +2) AVCodecContext.encode is a private field and is not supposed to be + accessed from outside of lavc. +2a) AVCodecContext.encode does not exist anymore in latest libavcodec, + so this block fails to build. +--- +diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c +index b2c1dd7..65e93a1 100644 +--- a/libmpcodecs/vf_lavc.c ++++ b/libmpcodecs/vf_lavc.c +@@ -76,11 +76,6 @@ static int config(struct vf_instance *vf, + return 0; + } + +- if (lavc_venc_context.codec->encode == NULL) { +- mp_msg(MSGT_VFILTER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n"); +- return 0; +- } +- + return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES); + } + +-- +cgit v0.9 diff --git a/community/mplayer2/mplayer2-20120729-libquvi-support.patch b/community/mplayer2/mplayer2-20120729-libquvi-support.patch new file mode 100644 index 000000000..f27fa690d --- /dev/null +++ b/community/mplayer2/mplayer2-20120729-libquvi-support.patch @@ -0,0 +1,277 @@ +From 37c124805c00ae0f2570c95f9543e39ce69793a6 Mon Sep 17 00:00:00 2001 +From: wm4 <wm4@mplayer2.org> +Date: Fri, 02 Mar 2012 19:24:34 +0000 +Subject: quvi: Add support for streaming sites using libquvi + +This enables playing URLs from libquvi supported streaming sites +directly, e.g. "mplayer http://www.youtube.com/watch?v=...." + +Anything opened with mplayer is checked with libquvi. If it looks like +a URL of a supported streaming site, libquvi is used to extract the +media URL, which is then passed to the lower level mplayer code +instead of the HTML URL. Hopefully the libquvi URL checker works well +enough that it doesn't cause any problems with normal URLs, files, or +whatever else mplayer's stream layer accepts. + +Add the --quvi-format option. The option value is directly passed +to libquvi as requested format. The only values that seem to work for +any streaming site seem to be "best" (best quality) and "default" +(lowest quality). The mplayer option defaults to "best" (overriding +libquvi's default). + +Outstanding issues: +- Does libquvi checking every opened file really not cause problems? + Should there be a runtime option to disable libquvi use? + (Probably not an issue.) +- Should we check/set the supported protocol? By default libquvi has + support for all protocols enabled. In the worst case, it might + return an URL using a protocol not supported by mplayer, even though + it could extract URLs with other protocols too. + (Probably not an issue.) +- Somehow export metadata (like media title) to the mplayer frontend? +--- +diff --git a/cfg-mplayer.h b/cfg-mplayer.h +index 5440de9..d8d556a 100644 +--- a/cfg-mplayer.h ++++ b/cfg-mplayer.h +@@ -517,6 +517,8 @@ const m_option_t common_opts[] = { + + OPT_MAKE_FLAGS("hr-mp3-seek", hr_mp3_seek, 0), + ++ OPT_STRING("quvi-format", quvi_format, 0), ++ + { "rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + { "rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + +diff --git a/configure b/configure +index 5c1e288..18bc404 100755 +--- a/configure ++++ b/configure +@@ -335,6 +335,7 @@ Optional features: + --enable-winsock2_h enable winsock2_h [autodetect] + --enable-smb enable Samba (SMB) input [autodetect] + --enable-live enable LIVE555 Streaming Media [disable] ++ --enable-libquvi enable libquvi [autodetect] + --enable-nemesi enable Nemesi Streaming Media [autodetect] + --disable-vcd disable VCD support [autodetect] + --disable-bluray disable Blu-ray support [autodetect] +@@ -650,6 +651,7 @@ _pvr=auto + networking=yes + _winsock2_h=auto + _smb=auto ++_libquvi=auto + _joystick=no + _xvid=auto + _libnut=auto +@@ -1009,6 +1011,8 @@ for ac_option do + --disable-winsock2_h) _winsock2_h=no ;; + --enable-smb) _smb=yes ;; + --disable-smb) _smb=no ;; ++ --enable-libquvi) _libquvi=yes ;; ++ --disable-libquvi) _libquvi=no ;; + --enable-joystick) _joystick=yes ;; + --disable-joystick) _joystick=no ;; + --enable-xvid) _xvid=yes ;; +@@ -3610,6 +3614,19 @@ else + fi + echores "$_smb" + ++echocheck "libquvi support" ++if test "$_libquvi" = auto ; then ++ _libquvi=no ++ if pkg_config_add libquvi ; then ++ _libquvi=yes ++ fi ++fi ++if test "$_libquvi" = yes; then ++ def_libquvi="#define CONFIG_LIBQUVI 1" ++else ++ def_libquvi="#undef CONFIG_LIBQUVI" ++fi ++echores "$_libquvi" + + ######### + # VIDEO # +@@ -6325,6 +6342,7 @@ LIBNEMESI = $_nemesi + LIBNUT = $_libnut + LIBPOSTPROC = $libpostproc + LIBSMBCLIENT = $_smb ++LIBQUVI = $_libquvi + LIBTHEORA = $_theora + LIRC = $_lirc + LIVE555 = $_live +@@ -6668,6 +6686,7 @@ $def_live + $def_nemesi + $def_networking + $def_smb ++$def_libquvi + $def_socklen_t + $def_vstream + +diff --git a/options.h b/options.h +index 48f5c53..89324bd 100644 +--- a/options.h ++++ b/options.h +@@ -78,6 +78,7 @@ typedef struct MPOpts { + char **audio_lang; + char **sub_lang; + int hr_mp3_seek; ++ char *quvi_format; + + char *audio_stream; + int audio_stream_cache; +diff --git a/stream/open.c b/stream/open.c +index ce0a415..91e9ae2 100644 +--- a/stream/open.c ++++ b/stream/open.c +@@ -26,12 +26,14 @@ + + #include "config.h" + #include "mp_msg.h" ++#include "talloc.h" + + #ifdef __FreeBSD__ + #include <sys/cdrio.h> + #endif + + #include "m_option.h" ++#include "options.h" + #include "stream.h" + #include "libmpdemux/demuxer.h" + +@@ -42,6 +44,62 @@ char* cdrom_device=NULL; + char* dvd_device=NULL; + int dvd_title=0; + ++#ifdef CONFIG_LIBQUVI ++ ++#include <quvi/quvi.h> ++ ++static const char *resolve_quvi(const char *url, struct MPOpts *opts) ++{ ++ char *media_title, *media_url; ++ quvi_media_t m; ++ QUVIcode rc; ++ quvi_t q; ++ ++ rc = quvi_init(&q); ++ if (rc != QUVI_OK) ++ return NULL; ++ ++ // Don't try to use quvi on an URL that's not directly supported, since ++ // quvi will do a network access anyway in order to check for HTTP ++ // redirections etc. ++ // The documentation says this will fail on "shortened" URLs. ++ if (quvi_supported(q, (char *)url) != QUVI_OK) { ++ quvi_close(&q); ++ return NULL; ++ } ++ ++ mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Checking URL...\n"); ++ ++ // Can use quvi_query_formats() to get a list of formats like this: ++ // "fmt05_240p|fmt18_360p|fmt34_360p|fmt35_480p|fmt43_360p|fmt44_480p" ++ // (This example is youtube specific.) ++ // That call requires an extra net access. quvi_next_media_url() doesn't ++ // seem to do anything useful. So we can't really do anything useful ++ // except pass through the user's format setting. ++ quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format ++ ? opts->quvi_format : "best"); ++ ++ rc = quvi_parse(q, (char *)url, &m); ++ if (rc != QUVI_OK) { ++ mp_msg(MSGT_OPEN, MSGL_ERR, "[quvi] %s\n", quvi_strerror(q, rc)); ++ quvi_close(&q); ++ return NULL; ++ } ++ ++ quvi_getprop(m, QUVIPROP_PAGETITLE, &media_title); ++ quvi_getprop(m, QUVIPROP_MEDIAURL, &media_url); ++ ++ mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Site media title: '%s'\n", ++ media_title); ++ media_url = talloc_strdup(NULL, media_url); ++ ++ quvi_parse_close(&m); ++ quvi_close(&q); ++ ++ return media_url; ++} ++#endif ++ + // Open a new stream (stdin/file/vcd/url) + + stream_t* open_stream(const char *filename, struct MPOpts *options, +@@ -59,7 +117,16 @@ if(!filename) { + return NULL; + } + +-//============ Open STDIN or plain FILE ============ ++ const char *resolved = NULL; ++ ++#ifdef CONFIG_LIBQUVI ++ resolved = resolve_quvi(filename, options); ++#endif ++ ++ if (resolved) ++ filename = resolved; + +- return open_stream_full(filename,STREAM_READ,options,file_format); ++ stream_t *res = open_stream_full(filename,STREAM_READ,options,file_format); ++ talloc_free((void *)resolved); ++ return res; + } +-- +cgit v0.9 +From 86f7fe1ba61a465fb25bc30deaaa4fcf12600a43 Mon Sep 17 00:00:00 2001 +From: wm4 <wm4@nowhere> +Date: Sun, 02 Sep 2012 18:45:11 +0000 +Subject: configure: add version check for libquvi + +I do not know what exactly is the minimum working version. Require the +latest version currently released, which is about half a year old. +--- +diff --git a/configure b/configure +index 2cf7aff..6a3298f 100755 +--- a/configure ++++ b/configure +@@ -3445,7 +3445,7 @@ echores "$_smb" + echocheck "libquvi support" + if test "$_libquvi" = auto ; then + _libquvi=no +- if pkg_config_add libquvi ; then ++ if pkg_config_add 'libquvi >= 0.4.1' ; then + _libquvi=yes + fi + fi +-- +cgit v0.9 +diff --git a/cfg-mplayer.h b/cfg-mplayer.h +index b889661..8b07091 100644 +--- a/cfg-mplayer.h ++++ b/cfg-mplayer.h +@@ -485,7 +485,7 @@ const m_option_t common_opts[] = { + + OPT_MAKE_FLAGS("hr-mp3-seek", hr_mp3_seek, 0), + +- OPT_STRING("quvi-format", quvi_format, 0), ++ OPT_STRING("quvi-format", quvi_format, 0, OPTDEF_STR("best")), + + { "rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + { "rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, +diff --git a/stream/open.c b/stream/open.c +index 91e9ae2..16d0dc3 100644 +--- a/stream/open.c ++++ b/stream/open.c +@@ -76,8 +76,7 @@ static const char *resolve_quvi(const char *url, struct MPOpts *opts) + // That call requires an extra net access. quvi_next_media_url() doesn't + // seem to do anything useful. So we can't really do anything useful + // except pass through the user's format setting. +- quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format +- ? opts->quvi_format : "best"); ++ quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format); + + rc = quvi_parse(q, (char *)url, &m); + if (rc != QUVI_OK) { +-- +cgit v0.9 diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD index 3312fe01f..542e6df3e 100644 --- a/community/multipath-tools/PKGBUILD +++ b/community/multipath-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75262 2012-08-17 10:00:23Z bpiotrowski $ +# $Id: PKGBUILD 80194 2012-11-17 14:32:27Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas S Hatch <thatch45 ar gmail dot com> # Contributor: Michael P <ptchinster@archlinux.us> @@ -6,7 +6,7 @@ pkgname=multipath-tools pkgver=0.4.9 -pkgrel=10 +pkgrel=11 pkgdesc='Multipath tools for Linux' arch=('i686' 'x86_64') url="http://christophe.varoqui.free.fr/" @@ -14,7 +14,7 @@ license=('GPL') depends=('bash' 'libaio' 'device-mapper') backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') install=multipath-tools.install -options=(!emptydirs) +options=(!emptydirs !strip) source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2 rc.d service multipath.conf multipath.conf.annotated fix-build.patch buffer-overflows.patch log_enquery_overflow.patch @@ -50,4 +50,6 @@ package() { install -Dm644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated install -Dm755 rc.d "$pkgdir"/etc/rc.d/multipathd install -Dm644 service "$pkgdir"/usr/lib/systemd/system/multipathd.service + + find $pkgdir -type f -exec sed 's/sbin/bin/g' -i {} \; } diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD index 47ff37d8e..814376e0e 100644 --- a/community/ncmpcpp/PKGBUILD +++ b/community/ncmpcpp/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 79964 2012-11-15 05:43:00Z bpiotrowski $ +# $Id: PKGBUILD 80192 2012-11-17 14:06:36Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski -# Contributor: Mateusz Herych <heniekk@gmail.com> +# Contributor: graysky <graysky AT archlinux DOT us> +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Army <uli[dot]armbruster[at]gmail[dot]com> pkgname=ncmpcpp pkgver=0.5.10 -pkgrel=2 +pkgrel=3 pkgdesc='Almost exact clone of ncmpc with some new features' arch=('i686' 'x86_64') url='http://ncmpcpp.rybczak.net/' @@ -29,4 +30,7 @@ build() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install + + make -C extras/ + install -Dm755 extras/artist_to_albumartist $pkgdir/usr/bin/ } diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 7adaea53a..b8d09e6af 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 79831 2012-11-13 15:52:46Z bpiotrowski $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> +# $Id: PKGBUILD 80209 2012-11-17 16:39:31Z bpiotrowski $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> _cfgdir=/etc/nginx @@ -8,10 +8,10 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.2.5 -pkgrel=1 -pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" +pkgrel=2 +pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') -depends=('pcre' 'zlib' 'openssl') +depends=('pcre' 'zlib' 'openssl' 'geoip') makedepends=('passenger') optdepends=('passenger') url="http://nginx.org" @@ -57,17 +57,16 @@ build() { --with-ipv6 --with-pcre-jit \ --with-file-aio \ --with-http_dav_module \ + --with-http_geoip_module \ --with-http_gzip_static_module \ --with-http_realip_module \ --with-http_ssl_module \ --with-http_stub_status_module \ --add-module=/usr/lib/passenger/ext/nginx \ #--with-http_mp4_module \ - #--with-http_realip_module \ #--with-http_addition_module \ #--with-http_xslt_module \ #--with-http_image_filter_module \ - #--with-http_geoip_module \ #--with-http_sub_module \ #--with-http_flv_module \ #--with-http_random_index_module \ diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD index a02bd13c1..c9df68411 100644 --- a/community/openntpd/PKGBUILD +++ b/community/openntpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75378 2012-08-21 16:04:24Z dreisner $ +# $Id: PKGBUILD 80216 2012-11-17 19:40:50Z jelle $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch) @@ -6,12 +6,13 @@ pkgname=openntpd pkgver=3.9p1 -pkgrel=19 +pkgrel=20 pkgdesc="Free, easy to use implementation of the Network Time Protocol." url="http://www.openntpd.org/" arch=('x86_64' 'i686') license=('BSD') depends=('openssl') +conflicts=('ntp') backup=('etc/ntpd.conf' 'etc/conf.d/openntpd') install=$pkgname.install source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz diff --git a/community/openntpd/openntpd.install b/community/openntpd/openntpd.install index 4f42aeb1f..5b440ee2f 100644 --- a/community/openntpd/openntpd.install +++ b/community/openntpd/openntpd.install @@ -1,24 +1,18 @@ -createuser() { - if ! getent group ntp >/dev/null; then - groupadd -g 87 ntp - fi - - if ! getent passwd ntp >/dev/null; then - useradd -g ntp -u 87 -d /var/empty -s /bin/false -c 'Network Time Protocol' ntp - fi -} - post_install() { - createuser + getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null + getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null + systemd-tmpfiles --create openntpd.conf + true } post_upgrade() { - createuser } post_remove() { - userdel ntp >/dev/null + getent passwd ntp &>/dev/null && userdel ntp >/dev/null + getent group ntp &>/dev/null && groupdel ntp >/dev/null + true } # vim: ts=2 sw=2 et ft=sh diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index a6e25c9f7..6150853ed 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,49 +1,26 @@ -# $Id: PKGBUILD 78938 2012-10-27 23:45:17Z ebelanger $ +# $Id: PKGBUILD 80212 2012-11-17 17:48:39Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous -pkgver=0.6.1 -pkgrel=17 +pkgver=0.7.0 +pkgrel=1 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" license=('GPL') -depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg') +depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'librsvg' 'ffmpeg') # opencv makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.50' 'mesa') optdepends=('performous-freesongs: free songs for performous') -source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2 - boost-filesystem-v3.patch - ffmpeg-0.11.patch - png15.patch - fix-boost-1.50-xtime.patch) -md5sums=('451a759de77984b5a699e91107fe52e2' - '42a8c825d80b0de16bd5752d2a80e585' - '07e52e926595d053155bbfb7168e308f' - '89157d5e21b0efd09fcbeee299d23c7e' - '6b43ab7f1c3e2cacd3540242634eabb3') +source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2) +md5sums=('60f3f72b51a630a4aa996484aedb9526') build() { - cd ${srcdir}/Performous-${pkgver}-Source - - # fix to built against boost 1.46 and later, upstream (git) now support v3 - patch -Np1 -i ../boost-filesystem-v3.patch - # fix with ffmpeg-0.11 - patch -Np1 -i ../ffmpeg-0.11.patch - # fix for libpng 1.5 - patch -Np1 -i ../png15.patch - # fix glib2.0 building - # #error "Only <glib.h> can be included directly." - sed -i -e 's#/gconvert.h#.h#g' game/unicode.cc - # boost 1.50 fix - patch -Np1 -i ../fix-boost-1.50-xtime.patch + cd ${srcdir}/performous-${pkgver} mkdir -p build cd build - # fix config loading with libxml++ - export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} - cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr .. @@ -51,7 +28,7 @@ build() { } package() { - cd ${srcdir}/Performous-${pkgver}-Source/build + cd ${srcdir}/performous-${pkgver}/build make DESTDIR="$pkgdir" install } diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD index 500f5d532..3b8299727 100644 --- a/community/pidgin-libnotify/PKGBUILD +++ b/community/pidgin-libnotify/PKGBUILD @@ -4,7 +4,7 @@ pkgname=pidgin-libnotify pkgver=0.14 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') pkgdesc="pidgin plugin that enables popups when someone logs in or messages you." url="http://gaim-libnotify.sourceforge.net/" @@ -14,16 +14,22 @@ makedepends=('libtool' 'intltool') replaces=('gaim-libnotify') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/gaim-libnotify/$pkgname-$pkgver.tar.gz language_fixes.patch - pidgin-libnotify-0.14-libnotify-0.7.patch) -md5sums=('bfb5368b69c02d429b2b17c00a6673c0' - 'e9bdbb3c7faa61f062fc64277457b6c0' - '05538625f14d9f2c12adae5fa6a1fa26') + pidgin-libnotify-0.14-libnotify-0.7.patch pidgin-libnotify-showbutton.patch) build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/language_fixes.patch" - patch -p0 -i "$srcdir/pidgin-libnotify-0.14-libnotify-0.7.patch" + patch -Np1 -i "$srcdir/language_fixes.patch" + patch -Np0 -i "$srcdir/pidgin-libnotify-0.14-libnotify-0.7.patch" + patch -Np0 -i "$srcdir/pidgin-libnotify-showbutton.patch" + ./configure --prefix=/usr --disable-deprecated --disable-static make +} +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('bfb5368b69c02d429b2b17c00a6673c0' + 'e9bdbb3c7faa61f062fc64277457b6c0' + '05538625f14d9f2c12adae5fa6a1fa26' + 'efe1e86aa1e0bc9f7d20efe7f34ad4a7') diff --git a/community/pidgin-libnotify/pidgin-libnotify-showbutton.patch b/community/pidgin-libnotify/pidgin-libnotify-showbutton.patch new file mode 100644 index 000000000..1f84e6025 --- /dev/null +++ b/community/pidgin-libnotify/pidgin-libnotify-showbutton.patch @@ -0,0 +1,10 @@ +--- src/pidgin-libnotify.c.orig 2007-10-01 20:52:38.000000000 +1000 ++++ src/pidgin-libnotify.c 2007-10-01 20:53:20.000000000 +1000 +@@ -307,6 +307,7 @@ + g_hash_table_insert (buddy_hash, contact, notification); + + g_object_set_data (G_OBJECT(notification), "contact", contact); ++ g_object_set_data (G_OBJECT(notification), "buddy", buddy); + + g_signal_connect (notification, "closed", G_CALLBACK(closed_cb), NULL); + diff --git a/community/pkgfile/PKGBUILD b/community/pkgfile/PKGBUILD index eaa0fdb88..1ab0717c3 100644 --- a/community/pkgfile/PKGBUILD +++ b/community/pkgfile/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 76836 2012-10-01 01:25:40Z dreisner $ +# $Id: PKGBUILD 80220 2012-11-17 22:28:33Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pkgfile -pkgver=6 +pkgver=7 pkgrel=1 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64') @@ -13,17 +13,23 @@ conflicts=('pkgtools<24-2') makedepends=('perl') source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) install=pkgfile.install -md5sums=('75139dd8441d60ee7682d900b610e189' - '75cca8e3c0198fa98e32b54fd5e936e6') +md5sums=('f1dc0052b1c21597ea2fa0f0ce05608c' + '28599a9b6e56860a9cba1c95ec797551') build() { cd "$pkgname-$pkgver" ./configure make + + # generate a license file + sed '/\*\//q' src/pkgfile.c >LICENSE } package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim: ft=sh syn=sh diff --git a/community/pmount/PKGBUILD b/community/pmount/PKGBUILD new file mode 100644 index 000000000..8bac8e37c --- /dev/null +++ b/community/pmount/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 80203 2012-11-17 15:45:57Z eric $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=pmount +pkgver=0.9.23 +pkgrel=4 +pkgdesc="mount removable devices as normal user" +arch=(i686 x86_64) +license=('GPL2') +url="http://pmount.alioth.debian.org/" +backup=('etc/pmount.allow') +depends=('sysfsutils>=2.0.0-1' 'bash' 'util-linux') +makedepends=('intltool') +source=(https://alioth.debian.org/frs/download.php/3310/pmount-0.9.23.tar.bz2) +md5sums=('db19f5bf3151b1b41705ec7bafa439d3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-hal \ + --with-cryptsetup-prog=/usr/sbin/cryptsetup + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/qingy/PKGBUILD b/community/qingy/PKGBUILD index 52801f11d..be106c095 100644 --- a/community/qingy/PKGBUILD +++ b/community/qingy/PKGBUILD @@ -1,38 +1,39 @@ -# $Id: PKGBUILD 75441 2012-08-24 00:19:10Z ebelanger $ +# $Id: PKGBUILD 80226 2012-11-18 01:50:13Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qingy pkgver=1.0.0 -pkgrel=6 +pkgrel=7 pkgdesc="A DirectFB getty replacement" arch=('i686' 'x86_64') url="http://qingy.sourceforge.net/" license=('GPL') depends=('directfb' 'openssl' 'libxss') makedepends=('emacs') -backup=('etc/qingy/settings' 'etc/qingy/welcomes') +backup=('etc/pam.d/qingy' 'etc/logrotate.d/qingy' 'etc/qingy/settings' 'etc/qingy/welcomes') options=('!libtool') install=qingy.install source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2 \ qingy.logrotate qingy@.service) sha1sums=('22ee505e935bf7ddcbd33e23f754a5a1ca082c81' '21676cf0b71334c666f7b3e4f3d8b4f319266c81' - '55cfd0b24c1dedd8aaea42fd03f5ec39a1be5e70') + '67f8fc1da5264cdaf79bd41a476451f4eef8f905') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's|/lib/security/||' media/pam/default/qingy XFREE=/usr/bin/Xorg XINIT=/usr/bin/xinit \ - ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \ - --disable-optimizations --enable-pam \ - --disable-static-build --enable-gpm-lock --enable-emacs + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ + --enable-emacs --disable-optimizations --disable-static make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/sbin" + ln -s ../usr/bin/qingy "${pkgdir}/sbin/qingy" install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy" install -D -m644 "${srcdir}/qingy@.service" "${pkgdir}/usr/lib/systemd/system/qingy@.service" } diff --git a/community/qingy/qingy@.service b/community/qingy/qingy@.service index ce2156def..ef9e7bfc2 100644 --- a/community/qingy/qingy@.service +++ b/community/qingy/qingy@.service @@ -5,7 +5,8 @@ After=systemd-user-sessions.service plymouth-quit-wait.service [Service] Environment=TERM=linux -ExecStart=/sbin/qingy %I -n +ExecStart=/usr/bin/qingy %I -n +Type=idle Restart=always RestartSec=0 UtmpIdentifier=%I |