From 3d6877ee9ee7bba813a4b6be30a11d2b1942c656 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 13 Apr 2014 03:48:21 +0000 Subject: Sun Apr 13 03:42:18 UTC 2014 --- community/docker/PKGBUILD | 4 +- community/erlang-cl/PKGBUILD | 16 +- community/erlang-sdl/PKGBUILD | 28 ++-- community/metakit/PKGBUILD | 37 ----- community/nautilus-share/PKGBUILD | 26 +++ community/ogle/PKGBUILD | 43 ----- community/ogle/dvdread-4.1.3.patch | 129 --------------- community/ogle/gcc34alsafix.patch | 15 -- community/ogle/gcc4.patch | 12 -- community/ogle/ogle-vuln-scripts-makefile.patch | 36 ----- community/ogle/xvideofix.patch | 205 ------------------------ community/python-psutil/PKGBUILD | 8 +- community/redshift/PKGBUILD | 19 +-- community/tdl/ChangeLog | 3 - community/tdl/PKGBUILD | 35 ++-- community/tdl/readline63.patch | 32 ++++ 16 files changed, 114 insertions(+), 534 deletions(-) delete mode 100644 community/metakit/PKGBUILD create mode 100644 community/nautilus-share/PKGBUILD delete mode 100644 community/ogle/PKGBUILD delete mode 100644 community/ogle/dvdread-4.1.3.patch delete mode 100644 community/ogle/gcc34alsafix.patch delete mode 100644 community/ogle/gcc4.patch delete mode 100644 community/ogle/ogle-vuln-scripts-makefile.patch delete mode 100644 community/ogle/xvideofix.patch delete mode 100644 community/tdl/ChangeLog create mode 100644 community/tdl/readline63.patch (limited to 'community') diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD index 77f6669ac..ff210c1b9 100644 --- a/community/docker/PKGBUILD +++ b/community/docker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 108340 2014-03-27 00:30:28Z seblu $ +# $Id: PKGBUILD 109230 2014-04-11 23:37:28Z seblu $ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=0.9.1 +pkgver=0.10.0 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container' diff --git a/community/erlang-cl/PKGBUILD b/community/erlang-cl/PKGBUILD index b195be36e..27d0a3d0f 100644 --- a/community/erlang-cl/PKGBUILD +++ b/community/erlang-cl/PKGBUILD @@ -4,29 +4,25 @@ pkgname=erlang-cl pkgver=1.2.1 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686') pkgdesc='OpenCL binding for Erlang' url='http://github.com/tonyrog/cl' license=('MIT') depends=('erlang' 'libcl' 'bash') replaces=('cl') -makedepends=('opencl-headers' 'rebar') -source=("https://github.com/tonyrog/cl/archive/cl-$pkgver.zip") -sha256sums=('63d720995f5bfa9f6a11211bb0ec400ad28799d127d2a642f06ee33769b145ab') +makedepends=('opencl-headers' 'rebar' 'git') +source=("$pkgname::git://github.com/tonyrog/cl.git#tag=cl-1.2.1") +md5sums=('SKIP') build() { - cd "cl-cl-$pkgver/c_src" + cd "$pkgname" rebar compile - #make configure - #./configure --with-wordsize="$_wordsize" --prefix=/usr - #[ $CARCH = x86_64 ] && make all64 || make all32 - #rm config.* } package() { - cd "cl-cl-$pkgver" + cd "$pkgname" mkdir -p "$pkgdir/usr/lib/erlang/lib/cl-$pkgver" cp -r * "$pkgdir/usr/lib/erlang/lib/cl-$pkgver" diff --git a/community/erlang-sdl/PKGBUILD b/community/erlang-sdl/PKGBUILD index 5ab68f661..6074cb98d 100644 --- a/community/erlang-sdl/PKGBUILD +++ b/community/erlang-sdl/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 85602 2013-03-03 21:28:43Z arodseth $ +# $Id: PKGBUILD 109263 2014-04-12 18:24:06Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: kappa pkgname=erlang-sdl -pkgver=1.2 -pkgrel=7 +pkgver=1.3.1 +pkgrel=1 arch=('x86_64' 'i686') pkgdesc='SDL and OpenGL bindings for Erlang' -url='http://esdl.sourceforge.net/' +url='http://github.com/dgud/esdl/' license=('custom') -depends=('erlang' 'sdl' 'glu' 'libgl' 'erlang') -makedepends=('mesa-libgl') -replaces=('esdl') -source=("$pkgname-$pkgver.tar.gz::https://github.com/dgud/esdl/archive/master.tar.gz") -sha256sums=('6a18010e12eed2abeb9b9893a2d89586e3ff14b44fce9c15b8ed091b67709438') +depends=('erlang' 'sdl' 'glu' 'libgl') +makedepends=('mesa-libgl' 'rebar' 'git') +# tag=esdl-1.3.1 fails mysteriously. Using commit instead. +source=("esdl::git://github.com/dgud/esdl.git#commit=dbd8ce9228aa36828091df2e8706c364094a3e22") +md5sums=('SKIP') build() { - cd "$srcdir/esdl-master" + cd esdl find -type f -print0 | xargs -0 chmod 644 - make + CFLAGS="$CFLAGS -Wno-deprecated-declarations" rebar compile } package() { - cd "$srcdir/esdl-master" + cd esdl - make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/esdl-$pkgver" install + install -d "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver" + cp -ruv c_src doc ebin include priv src \ + "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver/" install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/metakit/PKGBUILD b/community/metakit/PKGBUILD deleted file mode 100644 index 2a8115db8..000000000 --- a/community/metakit/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 99910 2013-10-31 02:25:20Z allan $ -# Contributor: Tom Newsom - -pkgname=metakit -pkgver=2.4.9.7 -pkgrel=5 -pkgdesc='MetaKit is an efficient database library with a small footprint' -arch=('i686' 'x86_64') -url='http://www.equi4.com/metakit/' -makedepends=('tcl' 'python2') -license=('BSD') -source=("http://www.equi4.com/pub/mk/${pkgname}-${pkgver}.tar.gz") -md5sums=('17330257376eea657827ed632ea62c9e') - -build() { - cd ${pkgname}-${pkgver}/builds - - sed -i 's_"${prefix}/include/python2.5"_"${prefix}/include/python2.7"_' ../unix/configure - sed -i 's_"${prefix}/lib/python2.5/site-packages"_"${prefix}/lib/python2.7/site-packages"_' ../unix/configure - - ../unix/configure \ - --prefix=/usr \ - --with-python \ - --with-tcl=/usr/include - - make -} - -package() { - cd ${pkgname}-${pkgver}/builds - - mkdir -p ${pkgdir}/usr/lib/python2.7/site-packages - - make DESTDIR=${pkgdir} install - - install -D -m644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/nautilus-share/PKGBUILD b/community/nautilus-share/PKGBUILD new file mode 100644 index 000000000..7e21de285 --- /dev/null +++ b/community/nautilus-share/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 109245 2014-04-12 15:53:10Z bgyorgy $ +# Maintainer: Balló György +# Contributor: Nevar + +pkgname=nautilus-share +pkgver=0.7.3 +pkgrel=7 +pkgdesc='Nautilus extension to share folder using Samba' +arch=('i686' 'x86_64') +url="https://git.gnome.org/browse/nautilus-share" +license=('GPL') +depends=('nautilus' 'samba') +makedepends=('intltool') +source=("http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") +sha256sums=('1686b1c3f9f2b4b35bcb0fc9f826f89e540d1e5fee8eb64806a8d31e3db55ad5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/ogle/PKGBUILD b/community/ogle/PKGBUILD deleted file mode 100644 index e168226be..000000000 --- a/community/ogle/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 99932 2013-10-31 02:32:50Z allan $ -# Maintainer: Eric Bélanger - -pkgname=ogle -pkgver=0.9.2 -pkgrel=13 -pkgdesc="A simple DVD player for Linux" -arch=('i686' 'x86_64') -url="http://www.dtek.chalmers.se/groups/dvd/" -license=('GPL') -depends=('sh' 'libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv' - 'alsa-lib' 'a52dec' 'libxxf86vm') -# http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz -source=(ftp://ftp.archlinux.org/other/ogle/${pkgname}-${pkgver}.tar.gz \ - xvideofix.patch gcc34alsafix.patch gcc4.patch dvdread-4.1.3.patch \ - ogle-vuln-scripts-makefile.patch) -md5sums=('a76a9892bdb807a4bcf859d15a91f0f9' - '57f1cf36eed82c56f24e9c0fc25ce2b3' - '4ebc822b252fade6b53c5ceb5be45bf5' - 'd08cff87c5ec41a7eebc0d2384835688' - '597906c64ff7f5185de8430fdae3107d' - 'd052b01f293c61d399fdd0ac2abb1cf4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/dvdread-4.1.3.patch" - patch -p1 -i "${srcdir}/xvideofix.patch" - patch -p1 -i "${srcdir}/gcc34alsafix.patch" - patch -p1 -i "${srcdir}/gcc4.patch" - patch -p0 -i "${srcdir}/ogle-vuln-scripts-makefile.patch" - - # fix alsa detection - stolen from their cvs - sed -i 's|^.*MINOR\=\=5.*$|#if SND_LIB_MAJOR==0 && SND_LIB_MINOR<6|' configure - sed -i 's|__diga_end:|\0;|' libogleao/alsa_audio.c - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-x - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - export LIBRARY_PATH="${pkgdir}/usr/lib/ogle" - make DESTDIR="${pkgdir}" install -} diff --git a/community/ogle/dvdread-4.1.3.patch b/community/ogle/dvdread-4.1.3.patch deleted file mode 100644 index d928ac2aa..000000000 --- a/community/ogle/dvdread-4.1.3.patch +++ /dev/null @@ -1,129 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2009/01/27 02:06:49 jmcneill Exp $ - ---- vmg/ifo_dump.c.orig 2009-01-26 21:00:17.000000000 -0500 -+++ vmg/ifo_dump.c 2009-01-26 21:00:33.000000000 -0500 -@@ -65,38 +65,38 @@ static void print_ifo(char *path, int ti - if(h->vmgi_mat != NULL) { - - printf("VMG top level\n-------------\n"); -- ifoPrint_VMGI_MAT(h->vmgi_mat); -+ ifo_print_VMGI_MAT(h->vmgi_mat); - - printf("\nFirst Play PGC\n--------------\n"); -- ifoPrint_PGC(h->first_play_pgc); -+ ifo_print_PGC(h->first_play_pgc); - - printf("\nTitle Track search pointer table\n"); - printf( "------------------------------------------------\n"); -- ifoPrint_TT_SRPT(h->tt_srpt); -+ ifo_print_TT_SRPT(h->tt_srpt); - - printf("\nMenu PGCI Unit table\n"); - printf( "--------------------\n"); - if(h->vmgi_mat->vmgm_pgci_ut != 0) { -- ifoPrint_PGCI_UT(h->pgci_ut); -+ ifo_print_PGCI_UT(h->pgci_ut); - } else - printf("No Menu PGCI Unit table present\n"); - - printf("\nParental Manegment Information table\n"); - printf( "------------------------------------\n"); - if(h->vmgi_mat->ptl_mait != 0) { -- ifoPrint_PTL_MAIT(h->ptl_mait); -+ ifo_print_PTL_MAIT(h->ptl_mait); - } else - printf("No Parental Management Information present\n"); - - printf("\nVideo Title Set Attribute Table\n"); - printf( "-------------------------------\n"); -- ifoPrint_VTS_ATRT(h->vts_atrt); -+ ifo_print_VTS_ATRT(h->vts_atrt); - - - printf("\nText Data Manager Information\n"); - printf( "-----------------------------\n"); - if(h->vmgi_mat->txtdt_mgi != 0) { -- //ifoPrint_TXTDT_MGI(h->txtdt_mgi); -+ //ifo_print_TXTDT_MGI(h->txtdt_mgi); - printf("Can't print Text Data Manager Information yet\n"); - } else - printf("No Text Data Manager Information present\n"); -@@ -106,14 +106,14 @@ static void print_ifo(char *path, int ti - printf("\nCell Address table\n"); - printf( "-----------------\n"); - if(h->vmgi_mat->vmgm_c_adt != 0) { -- ifoPrint_C_ADT(h->menu_c_adt); -+ ifo_print_C_ADT(h->menu_c_adt); - } else - printf("No Cell Address table present\n"); - - printf("\nVideo Title set Menu VOBU address map\n"); - printf( "-----------------\n"); - if(h->vmgi_mat->vmgm_vobu_admap != 0) { -- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap); -+ ifo_print_VOBU_ADMAP(h->menu_vobu_admap); - } else - printf("No Menu VOBU address map present\n"); - } -@@ -122,20 +122,20 @@ static void print_ifo(char *path, int ti - if(h->vtsi_mat != NULL) { - - printf("VTS top level\n-------------\n"); -- ifoPrint_VTSI_MAT(h->vtsi_mat); -+ ifo_print_VTSI_MAT(h->vtsi_mat); - - printf("\nPart of title search pointer table information\n"); - printf( "----------------------------------------------\n"); -- ifoPrint_VTS_PTT_SRPT(h->vts_ptt_srpt); -+ ifo_print_VTS_PTT_SRPT(h->vts_ptt_srpt); - - printf("\nPGCI Unit table\n"); - printf( "--------------------\n"); -- ifoPrint_PGCIT(h->vts_pgcit); -+ ifo_print_PGCIT(h->vts_pgcit); - - printf("\nMenu PGCI Unit table\n"); - printf( "--------------------\n"); - if(h->vtsi_mat->vtsm_pgci_ut != 0) { -- ifoPrint_PGCI_UT(h->pgci_ut); -+ ifo_print_PGCI_UT(h->pgci_ut); - } else - printf("No Menu PGCI Unit table present\n"); - -@@ -144,31 +144,31 @@ static void print_ifo(char *path, int ti - printf("\nTime Map table\n"); - printf( "-----------------\n"); - if(h->vtsi_mat->vts_tmapt != 0) { -- ifoPrint_VTS_TMAPT(h->vts_tmapt); -+ ifo_print_VTS_TMAPT(h->vts_tmapt); - } else - printf("No Time Map table present\n"); - - printf("\nMenu Cell Address table\n"); - printf( "-----------------\n"); - if(h->vtsi_mat->vtsm_c_adt != 0) { -- ifoPrint_C_ADT(h->menu_c_adt); -+ ifo_print_C_ADT(h->menu_c_adt); - } else - printf("No Cell Address table present\n"); - - printf("\nVideo Title Set Menu VOBU address map\n"); - printf( "-----------------\n"); - if(h->vtsi_mat->vtsm_vobu_admap != 0) { -- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap); -+ ifo_print_VOBU_ADMAP(h->menu_vobu_admap); - } else - printf("No Menu VOBU address map present\n"); - - printf("\nCell Address table\n"); - printf( "-----------------\n"); -- ifoPrint_C_ADT(h->vts_c_adt); -+ ifo_print_C_ADT(h->vts_c_adt); - - printf("\nVideo Title Set VOBU address map\n"); - printf( "-----------------\n"); -- ifoPrint_VOBU_ADMAP(h->vts_vobu_admap); -+ ifo_print_VOBU_ADMAP(h->vts_vobu_admap); - - } - } diff --git a/community/ogle/gcc34alsafix.patch b/community/ogle/gcc34alsafix.patch deleted file mode 100644 index 76de3462d..000000000 --- a/community/ogle/gcc34alsafix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ogle-0.9.2/libogleao/alsa_audio.c 2003-10-18 17:38:30.000000000 -0700 -+++ ogle-0.9.2-patch/libogleao/alsa_audio.c 2005-04-22 18:21:23.000000000 -0700 -@@ -248,10 +248,9 @@ - //Shouldn't ctl_handle be closed here? - } - -- snd_ctl_close(ctl_handle); -- -- __diga_end: -+ snd_ctl_close(ctl_handle); - } -+ __diga_end: - - return 0; - } diff --git a/community/ogle/gcc4.patch b/community/ogle/gcc4.patch deleted file mode 100644 index b6a10a325..000000000 --- a/community/ogle/gcc4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN ogle-0.9.2-old/ac3/ac3dec_wrap.c ogle-0.9.2/ac3/ac3dec_wrap.c ---- ogle-0.9.2-old/ac3/ac3dec_wrap.c 2003-03-02 15:50:03.000000000 +0000 -+++ ogle-0.9.2/ac3/ac3dec_wrap.c 2005-09-30 17:07:27.000000000 +0000 -@@ -48,7 +48,7 @@ - static void handle_events(MsgEventQ_t *q, MsgEvent_t *ev); - - --static char *program_name; -+char *program_name; - - static FILE *outfile; - diff --git a/community/ogle/ogle-vuln-scripts-makefile.patch b/community/ogle/ogle-vuln-scripts-makefile.patch deleted file mode 100644 index f25964378..000000000 --- a/community/ogle/ogle-vuln-scripts-makefile.patch +++ /dev/null @@ -1,36 +0,0 @@ -This patch inhibits the installation of debug scripts vulnerable to a symlink -attack, see bug 245921 for reference. - ---- scripts/Makefile.in.orig 2009-04-04 18:13:33.000000000 +0200 -+++ scripts/Makefile.in 2009-04-04 18:15:46.000000000 +0200 -@@ -133,10 +133,10 @@ - subdir = scripts - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_CLEAN_FILES = ogle --SCRIPTS = $(bin_SCRIPTS) $(dist_pkglib_SCRIPTS) -+SCRIPTS = $(bin_SCRIPTS) - - DIST_SOURCES = --DIST_COMMON = $(dist_pkglib_SCRIPTS) Makefile.am Makefile.in ogle.in -+DIST_COMMON = Makefile.am Makefile.in ogle.in - all: all-am - - .SUFFIXES: -@@ -279,7 +279,7 @@ - - install-data-am: - --install-exec-am: install-binSCRIPTS install-dist_pkglibSCRIPTS -+install-exec-am: install-binSCRIPTS - - install-info: install-info-am - -@@ -295,7 +295,7 @@ - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - --uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkglibSCRIPTS \ -+uninstall-am: uninstall-binSCRIPTS \ - uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ diff --git a/community/ogle/xvideofix.patch b/community/ogle/xvideofix.patch deleted file mode 100644 index aafde447a..000000000 --- a/community/ogle/xvideofix.patch +++ /dev/null @@ -1,205 +0,0 @@ ---- ogle-0.9.2/mpeg2_video/video_output_x11.c 2003-11-04 04:02:10.000000000 -0800 -+++ ogle-0.9.2-patch/mpeg2_video/video_output_x11.c 2005-04-22 18:37:56.000000000 -0700 -@@ -286,6 +286,7 @@ - } - } - -+ - /* This section of the code looks for the Xv extension for hardware - * yuv->rgb and scaling. If it is not found, or any suitable adapter - * is not found, use_xv will be set to 0. Otherwise it allocates a -@@ -299,121 +300,136 @@ - { - int xv_found = 0; - #ifdef HAVE_XV -- int i, j; -+ int i, j, k; - int result; - - xv_port = 0; /* We have no port yet. */ -- -+ - /* Check for the Xvideo extension */ -- result = XvQueryExtension(mydisplay, &xv_version, &xv_release, -- &xv_request_base, &xv_event_base, -+ result = XvQueryExtension(mydisplay, &xv_version, &xv_release, -+ &xv_request_base, &xv_event_base, - &xv_error_base); - if(result != Success) { - WARNING("%s", "Xvideo extension not found\n"); - use_xv = 0; - return; - } -- -+ - NOTE("Found Xv extension %d.%d, checking for suitable adaptors\n", - xv_version, xv_release); -- -+ - /* Check for available adaptors */ -- result = XvQueryAdaptors(mydisplay, DefaultRootWindow (mydisplay), -+ result = XvQueryAdaptors(mydisplay, DefaultRootWindow (mydisplay), - &xv_num_adaptors, &xv_adaptor_info); - if(result != Success) { - WARNING("%s", "No Xv adaptors found\n"); - use_xv = 0; - return; - } -- -+ - /* Check adaptors */ - for(i = 0; i < xv_num_adaptors; i++) { -- -+ - /* Is it usable for displaying XvImages */ - if(!(xv_adaptor_info[i].type & XvInputMask) || - !(xv_adaptor_info[i].type & XvImageMask)) - continue; -- -- xv_port = xv_adaptor_info[i].base_id; -- -- /* Check image formats of adaptor */ -- xv_formats = XvListImageFormats(mydisplay, xv_port, &xv_num_formats); -- for(j = 0; j < xv_num_formats; j++) { -- if(xv_formats[j].id == 0x32315659) { /* YV12 */ -- //if(xv_formats[j].id == 0x30323449) { /* I420 */ -- xv_id = xv_formats[j].id; -- break; -- } -- } -- /* No matching format found */ -- if(j == xv_num_formats) -- continue; -- -- NOTE("Xv adaptor \"%s\" port %li image format %i\n", -- xv_adaptor_info[i].name, xv_port, xv_id); -- -- /* Allocate XvImages */ -+ -+ /* Check Available Ports */ -+ for (j = 0; j < xv_adaptor_info[i].num_ports && !xv_port ; j++) { -+ -+ /* Check Image formats of adaptor */ -+ xv_formats = XvListImageFormats(mydisplay,xv_adaptor_info[i].base_id + j, &xv_num_formats); -+ for (k = 0; k < xv_num_formats; k ++) { -+ -+ /* Check for proper format (YV12) and see if we can grab the port */ -+ if ( (xv_formats[k].id == 0x32315659) && (XvGrabPort(mydisplay,xv_adaptor_info[i].base_id + j,0) == Success) ) { -+ xv_id = xv_formats[k].id; -+ xv_port = xv_adaptor_info[i].base_id + j; -+ break; -+ } -+ -+ } -+ -+ /* delete stuff nicely */ -+ XFree(xv_formats); -+ } -+ -+ /* Check next Adapter */ -+ if (xv_port==0) continue; -+ -+ /* Report what we found */ -+ NOTE("Xv adaptor \"%s\" port %li image format %i\n", xv_adaptor_info[i].name, xv_port, xv_id); -+ -+ /* Allocate XvImage */ - xv_image = XvShmCreateImage(mydisplay, xv_port, xv_id, NULL, - padded_width, -- padded_height, -+ padded_height, - &shm_info); -- -- /* Got an Image? */ -+ -+ /* Got an milk? */ - if(xv_image == NULL) - continue; -- -+ - /* Test and see if we really got padded_width x padded_height */ - if(xv_image->width != padded_width || - xv_image->height != padded_height) { - FATAL("XvShmCreateImage got size: %d x %d\n", - xv_image->width, xv_image->height); - exit(1); -- } -- -+ } -+ -+ /* Now Finish Up */ - shm_info.shmid = picture_buffer_shmid; - shm_info.shmaddr = picture_buffer_addr; -- -- /* Set the data pointer to the decoders picture segment. */ -+ -+ /* Set the data pointer to the decoders picture segment. */ - // xv_image->data = picture_data->y; - shm_info.readOnly = True; -- -+ - /* make sure we don't have any unhandled errors */ - XSync(mydisplay, False); -- -+ - /* set error handler so we can check if xshmattach failed */ - prev_xerrhandler = XSetErrorHandler(xshm_errorhandler); -- -+ - /* get the serial of the xshmattach request */ - req_serial = NextRequest(mydisplay); -- -+ - /* try to attach */ - XShmAttach(mydisplay, &shm_info); -- -+ - /* make sure xshmattach has been processed and any errors - have been returned to us */ - XSync(mydisplay, False); -- -+ - /* revert to the previous xerrorhandler */ - XSetErrorHandler(prev_xerrhandler); -- -+ - if(use_xshm) { - #if 0 - shmctl(shm_info.shmid, IPC_RMID, 0); // only works on Linux.. - #endif -- -+ - CompletionType = XShmGetEventBase(mydisplay) + ShmCompletion; - } - xv_found = 1; - - /* All set up! */ - break; -- } -+ } -+ -+ /* Clean up */ -+ XvFreeAdaptorInfo(xv_adaptor_info); -+ - #endif /* HAVE_XV */ -+ /* In case we didn't find a working Xv */ - if(!xv_found) { - use_xv = 0; -- } --} -- -+ } -+ -+ } -+ - - /* This section of the code tries to use the MIT XShm extension for - * accellerated transfers to to X. XShm extension is need and only -@@ -1726,6 +1742,8 @@ - - if(mydisplay) { - XSync(mydisplay,True); -+ if (use_xv) -+ XvUngrabPort(mydisplay,xv_port,CurrentTime); - if(use_xshm) - XShmDetach(mydisplay, &shm_info); - if(window.ximage != 0) diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index 56b185db6..43032b93f 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 108467 2014-03-27 14:48:02Z fyan $ +# $Id: PKGBUILD 109232 2014-04-11 23:45:33Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') -pkgver=2.0.0 -pkgrel=2 +pkgver=2.1.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://code.google.com/p/psutil/' license=('custom: BSD') makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools') checkdepends=('net-tools' 'procps-ng') source=("https://pypi.python.org/packages/source/p/psutil/psutil-$pkgver.tar.gz") -md5sums=('9ee83ff3d68396f91ebdf71ae83b152d') +md5sums=('ba1f51f4c8e2c74cba48cef70b8a5bec') build() { cd psutil-$pkgver diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD index d75a6c2c2..aff73c9fd 100644 --- a/community/redshift/PKGBUILD +++ b/community/redshift/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103169 2013-12-28 17:00:30Z lfleischer $ +# $Id: PKGBUILD 109293 2014-04-12 21:39:07Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Geoffrey Teale # Contributor: Mark, Huo Mian # Contributor: Biginoz pkgname=redshift -pkgver=1.8 +pkgver=1.9 pkgrel=1 pkgdesc='Adjusts the color temperature of your screen according to your surroundings.' arch=('i686' 'x86_64') @@ -13,22 +13,17 @@ url='http://jonls.dk/redshift/' license=('GPL3') depends=('gconf' 'geoclue' 'libxxf86vm') optdepends=('pygtk: for gtk-redshift' - 'python2-xdg: for gtk-redshift' + 'python-xdg: for gtk-redshift' 'librsvg: for gtk-redshift') -makedepends=('python2') +makedepends=('python') install='redshift.install' -source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a05c34bc7b8fbb4f5d546a0b5cca5d6f') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/python/python2/' src/redshift-gtk/redshift-gtk -} +source=("https://github.com/jonls/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz") +md5sums=('9640218cd9ba88f6d10b347b2277c415') build() { cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr + PYTHON=/usr/bin/python ./configure --prefix=/usr make } diff --git a/community/tdl/ChangeLog b/community/tdl/ChangeLog deleted file mode 100644 index dba4cf7ec..000000000 --- a/community/tdl/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-06-27 tardo -* Built for x86_64 - diff --git a/community/tdl/PKGBUILD b/community/tdl/PKGBUILD index fbcd02fdc..12d9cec49 100644 --- a/community/tdl/PKGBUILD +++ b/community/tdl/PKGBUILD @@ -1,26 +1,35 @@ -# $Id: PKGBUILD 66539 2012-02-26 00:04:59Z lfleischer $ -# Maintainer: Jeff Mickey -# Contributor: Jeff "codemac" Mickey +# $Id: PKGBUILD 109251 2014-04-12 16:55:40Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Jeff Mickey pkgname=tdl pkgver=1.5.2 -pkgrel=5 -pkgdesc="A to-do list manager." -arch=('i686' 'x86_64') -url="http://www.rc0.org.uk/tdl/" +pkgrel=6 +pkgdesc='TODO list manager' +arch=('x86_64' 'i686') +url='https://github.com/rc0/tdl' license=('GPL') -depends=('ncurses') -source=("http://www.rpcurnow.force9.co.uk/tdl/$pkgname-$pkgver.tar.gz") -md5sums=('620cb00bf99b7e786e2b54cda6339a1e') +depends=('readline') +makedepends=('git') +source=("$pkgname::git://github.com/T-J-Teru/tdl.git#commit=382c52a2d1f2d064110c189459fe09a6edb12761" 'readline63.patch') +md5sums=('SKIP' + 'dada1488632f9d672e75e15cfb011ecb') + +prepare() { + cd "$pkgname" + + patch -p1 -i "$srcdir/readline63.patch" +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname" ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + make -C "$pkgname" DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/tdl/readline63.patch b/community/tdl/readline63.patch new file mode 100644 index 000000000..b42ddec02 --- /dev/null +++ b/community/tdl/readline63.patch @@ -0,0 +1,32 @@ +--- a/inter.c 2014-04-12 18:48:39.020103780 +0200 ++++ b/inter.c 2014-04-12 18:48:33.323365100 +0200 +@@ -556,7 +556,7 @@ + static char *interactive_text_readline(char *prompt, char *initval, int *is_blank, int *error)/*{{{*/ + { + char *line; +- Function *old_rl_pre_input_hook = NULL; ++ rl_command_func_t *old_rl_pre_input_hook = NULL; + + *error = 0; + old_rl_pre_input_hook = rl_pre_input_hook; +@@ -633,9 +633,9 @@ + #ifdef USE_READLINE + if (isatty(0)) { + char *result; +- rl_attempted_completion_function = (CPPFunction *) null_tdl_completion; ++ rl_attempted_completion_function = null_tdl_completion; + result = interactive_text_readline(prompt, initval, is_blank, error); +- rl_attempted_completion_function = (CPPFunction *) tdl_completion; ++ rl_attempted_completion_function = tdl_completion; + return result; + } else { + /* In case someone wants to drive tdl from a script, by redirecting stdin to it. */ +@@ -653,7 +653,7 @@ + #ifdef USE_READLINE + if (isatty(0)) { + rl_completion_entry_function = NULL; +- rl_attempted_completion_function = (CPPFunction *) tdl_completion; ++ rl_attempted_completion_function = tdl_completion; + interactive_readline(); + } else { + /* In case someone wants to drive tdl from a script, by redirecting stdin to it. */ -- cgit v1.2.3-54-g00ecf