diff options
Diffstat (limited to 'extra')
28 files changed, 185 insertions, 567 deletions
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 929d166e7..4a19ca0b7 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 194389 2013-09-15 12:35:01Z schiv $ +# $Id: PKGBUILD 197518 2013-10-26 13:26:11Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: see .contrib pkgname=ardour _pkgname=Ardour3 -pkgver=3.4 +pkgver=3.5.14 +_pkgver=3.5 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64') @@ -18,18 +19,18 @@ optdepends=('xjadeo: video monitoring') install=$pkgname.install source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('4c2286d9c5de6846e2abaa2a8fab0349' +md5sums=('2e472cb38938a2e1fe3fb5b89d705adc' '316bd21ece5e2208a104fd09cac521af') prepare() { - cd "$srcdir/$_pkgname-$pkgver" + cd "$srcdir/$_pkgname-$_pkgver" # python2 fix sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript } build() { - cd "$srcdir/$_pkgname-$pkgver" + cd "$srcdir/$_pkgname-$_pkgver" python2 waf configure --prefix=/usr \ --configdir=/etc \ @@ -39,7 +40,7 @@ build() { } package() { - cd "$srcdir/$_pkgname-$pkgver" + cd "$srcdir/$_pkgname-$_pkgver" python2 waf install --destdir="$pkgdir" diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD index d1c37bc3b..4d4cce637 100644 --- a/extra/dssi/PKGBUILD +++ b/extra/dssi/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 196279 2013-10-10 13:13:50Z schiv $ +# $Id: PKGBUILD 197528 2013-10-26 14:48:17Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Pajaro pkgname=dssi pkgver=1.1.1 -pkgrel=4 +pkgrel=5 pkgdesc="An API for audio processing plugins & softsynths with UIs" arch=('i686' 'x86_64') url="http://dssi.sourceforge.net/" license=('LGPL' 'BSD' 'custom') -depends=('liblo' 'jack') +depends=('liblo>=1:0.26' 'liblo<1:0.27' 'jack') makedepends=('ladspa' 'qt4') optdepends=('qt4: example plugins') -options=('!libtool') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'license.txt') md5sums=('619ab73c883b02dc37ddb37001591f8b' diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD index e9af5dcf6..9c701c2c9 100644 --- a/extra/libimobiledevice/PKGBUILD +++ b/extra/libimobiledevice/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 185167 2013-05-11 16:16:32Z tomegun $ +# $Id: PKGBUILD 197450 2013-10-26 06:44:55Z allan $ # Maintainer : Tom Gundersen <teg@jklm.no> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libimobiledevice pkgver=1.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" url="http://libimobiledevice.org/" arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') depends=('usbmuxd' 'gnutls' 'libgcrypt') -options=('!libtool') source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) build() { diff --git a/extra/liblo/PKGBUILD b/extra/liblo/PKGBUILD index 8f0ac3746..593c30ff2 100644 --- a/extra/liblo/PKGBUILD +++ b/extra/liblo/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 186897 2013-05-31 15:30:05Z schiv $ +# $Id: PKGBUILD 197527 2013-10-26 14:48:03Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Pajaro pkgname=liblo -pkgver=0.27 -pkgrel=1 -pkgdesc="Lightweight OSC implementation: an implementation of the Open Sound Control protocol for POSIX systems" +pkgver=0.26 +pkgrel=2 +epoch=1 +pkgdesc="A lightweight OSC (Open Sound Control) implementation" arch=('i686' 'x86_64') -url="http://plugin.org.uk/liblo/" +url="http://liblo.sourceforge.net/" license=('GPL') depends=('glibc') -options=('!libtool') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('e4317bab5b16003df350adfe2c181364') +md5sums=('5351de14262560e15e7f23865293b16f') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,3 +27,5 @@ package() { make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/liblrdf/PKGBUILD b/extra/liblrdf/PKGBUILD index b65f689b3..c1ef2a9dd 100644 --- a/extra/liblrdf/PKGBUILD +++ b/extra/liblrdf/PKGBUILD @@ -1,16 +1,14 @@ -# $Id: PKGBUILD 161476 2012-06-11 19:18:53Z eric $ +# $Id: PKGBUILD 197453 2013-10-26 06:52:09Z allan $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=liblrdf pkgver=0.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library for the manipulation of RDF file in LADSPA plugins" arch=('i686' 'x86_64') url="https://github.com/swh/LRDF" depends=('raptor' 'ladspa') license=('GPL') -options=('!libtool') -groups=('ladspa-plugins') source=(${pkgname}-${pkgver}.tar.gz::https://github.com/swh/LRDF/tarball/${pkgver}) md5sums=('005ea24152620da7f2ee80a78e17f784') diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD index de721c4a7..39675625b 100644 --- a/extra/netpbm/PKGBUILD +++ b/extra/netpbm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184413 2013-05-06 19:38:51Z foutrelis $ +# $Id: PKGBUILD 197557 2013-10-26 21:24:07Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=netpbm pkgver=10.61.02 -pkgrel=2 +pkgrel=3 pkgdesc="A toolkit for manipulation of graphic images" arch=('i686' 'x86_64') license=('custom' 'BSD' 'GPL' 'LGPL') @@ -34,7 +34,7 @@ mksource() { } prepare() { - cd "${srcdir}/advanced" + cd advanced patch -p1 < ../netpbm-CAN-2005-2471.patch patch -p1 < ../netpbm-security-code.patch @@ -56,26 +56,22 @@ prepare() { } build() { - cd "${srcdir}/advanced" - + cd advanced make - # Generating useful man pages with html doc - cd "${srcdir}/doc" make MAKEMAN="${srcdir}/advanced/buildtools/makeman" USERGUIDE=. \ - -f "${srcdir}/advanced/buildtools/manpage.mk" manpages + -C ../doc -f "${srcdir}/advanced/buildtools/manpage.mk" manpages } package() { - cd "${srcdir}/advanced" + cd advanced make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev # Removing dummy man pages rm "${pkgdir}"/usr/share/man/man{1,3,5}/* - cd "${srcdir}/doc" make MAKEMAN="${srcdir}/advanced/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \ - -f "${srcdir}/advanced/buildtools/manpage.mk" installman + -C ../doc -f "${srcdir}/advanced/buildtools/manpage.mk" installman # Replace obsolete utility echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > "${pkgdir}/usr/bin/pgmtopbm" diff --git a/extra/portmidi/PKGBUILD b/extra/portmidi/PKGBUILD index bf08d19b5..1352add41 100644 --- a/extra/portmidi/PKGBUILD +++ b/extra/portmidi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197308 2013-10-25 02:13:59Z eric $ +# $Id: PKGBUILD 197534 2013-10-26 17:21:06Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=portmidi pkgver=217 -pkgrel=4 +pkgrel=5 pkgdesc="Platform independent library for real-time MIDI input/output" arch=('i686' 'x86_64') url="http://portmedia.sourceforge.net/" @@ -11,21 +11,27 @@ license=('GPL') depends=('alsa-lib') makedepends=('cmake' 'java-environment') optdepends=('java-runtime: for using pmdefaults') +options=('!makeflags') source=(http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip portmidi-217-build-fix.patch) sha1sums=('f45bf4e247c0d7617deacd6a65d23d9fddae6117' - '7fe10874ea8689e1ba51e8f50da38e79d10b76e1') + 'a89b80531ccc823ba267aaf21920e59deec80e99') prepare() { cd ${pkgname} + sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py + mkdir -p pm_java/Release + # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118) patch -p1 -i "${srcdir}/portmidi-217-build-fix.patch" } build() { cd ${pkgname} - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ - -DPORTMIDI_ENABLE_TEST=OFF -DPORTMIDI_ENABLE_JAVA=ON + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \ + -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \ + -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release make } diff --git a/extra/portmidi/portmidi-217-build-fix.patch b/extra/portmidi/portmidi-217-build-fix.patch index e741e6576..3e2dfef29 100644 --- a/extra/portmidi/portmidi-217-build-fix.patch +++ b/extra/portmidi/portmidi-217-build-fix.patch @@ -1,318 +1,29 @@ ---- portmidi/CMakeLists.txt -+++ portmidi/CMakeLists.txt -@@ -9,12 +9,11 @@ - set(CMAKE_BUILD_TYPE Release CACHE STRING - "Semicolon-separate list of supported configuration types") - # set default directories but don't override cached values... -- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} -+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - CACHE STRING "libraries go here") -- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} -+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - CACHE STRING "libraries go here") -- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY -- ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} -+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - CACHE STRING "executables go here") - - else(UNIX) -@@ -68,10 +67,20 @@ - include_directories(pm_common porttime) - add_subdirectory(pm_common) - --add_subdirectory(pm_test) -+option(PORTMIDI_ENABLE_JAVA "Enable Java bindings support" ON) -+option(PORTMIDI_ENABLE_STATIC "Build and install static libraries" OFF) -+option(PORTMIDI_ENABLE_TEST "Build test programs" ON) -+ -+if(PORTMIDI_ENABLE_TEST) -+ add_subdirectory(pm_test) -+endif(PORTMIDI_ENABLE_TEST) - - add_subdirectory(pm_dylib) - - # Cannot figure out how to make an xcode Java application with CMake --add_subdirectory(pm_java) -+if(PORTMIDI_ENABLE_JAVA) -+ set(JAR_INSTALL_DIR share/java -+ CACHE STRING "Define directory name for jar installation") -+ add_subdirectory(pm_java) -+endif(PORTMIDI_ENABLE_JAVA) - ---- portmidi/pm_common/CMakeLists.txt -+++ portmidi/pm_common/CMakeLists.txt -@@ -44,9 +44,6 @@ - - # first include the appropriate system-dependent file: - if(UNIX) -- # add the -g switch for Linux and Mac OS X (not used in Win32) -- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" -- CACHE STRING "enable extra checks for debugging" FORCE) - if(APPLE) - set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) - prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) -@@ -62,19 +59,23 @@ - ${COREMIDI_LIB} ${CORESERVICES_LIB} - CACHE INTERNAL "") - -- set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework") -- set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers) -+ if(PORTMIDI_ENABLE_JAVA) -+ set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework") -+ set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers) -+ endif(PORTMIDI_ENABLE_JAVA) - message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT}) - else(APPLE) - # LINUX settings... -- include(FindJNI) -- message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) -- message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) -- message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2}) -- message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY}) -- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) -- # libjvm.so is found relative to JAVA_INCLUDE_PATH: -- set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so) -+ if(PORTMIDI_ENABLE_JAVA) -+ include(FindJNI) -+ message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) -+ message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) -+ message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2}) -+ message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY}) -+ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) -+ # libjvm.so is found relative to JAVA_INCLUDE_PATH: -+ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so) -+ endif(PORTMIDI_ENABLE_JAVA) - - set(LINUXSRC pmlinuxalsa pmlinux finddefault) - prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC}) -@@ -88,10 +89,12 @@ - # /MD is multithread DLL, /MT is multithread. Change to static: - include(../pm_win/static.cmake) - -- include(FindJNI) -+ if(PORTMIDI_ENABLE_JAVA) -+ include(FindJNI) - -- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) -- # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) -+ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) -+ # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) -+ endif(PORTMIDI_ENABLE_JAVA) - - set(WINSRC pmwin pmwinmm) - prepend_path(LIBSRC ../pm_win/ ${WINSRC}) -@@ -99,29 +102,43 @@ - set(PM_NEEDED_LIBS winmm.lib) - endif(WIN32) - endif(UNIX) --set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY}) -+ -+if(PORTMIDI_ENABLE_JAVA) -+ set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY}) -+endif(PORTMIDI_ENABLE_JAVA) - - # this completes the list of library sources by adding shared code - list(APPEND LIBSRC pmutil portmidi) - - # now add the shared files to make the complete list of library sources --add_library(portmidi-static ${LIBSRC}) --set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s") --target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) -- --# define the jni library --include_directories(${JAVA_INCLUDE_PATHS}) -- --set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c) --add_library(pmjni SHARED ${JNISRC}) --target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) --set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") -+if(PORTMIDI_ENABLE_STATIC) -+ add_library(portmidi-static ${LIBSRC}) -+ set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi") -+ target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) -+endif(PORTMIDI_ENABLE_STATIC) -+ -+if(PORTMIDI_ENABLE_JAVA) -+ # define the jni library -+ include_directories(${JAVA_INCLUDE_PATHS}) -+ -+ set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c) -+ add_library(pmjni SHARED ${JNISRC}) -+ target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) -+ set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") -+endif(PORTMIDI_ENABLE_JAVA) - - # install the libraries (Linux and Mac OS X command line) - if(UNIX) -- INSTALL(TARGETS portmidi-static pmjni -- LIBRARY DESTINATION /usr/local/lib -- ARCHIVE DESTINATION /usr/local/lib) -+ if(PORTMIDI_ENABLE_STATIC) -+ INSTALL(TARGETS portmidi-static -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) -+ endif(PORTMIDI_ENABLE_STATIC) -+ if(PORTMIDI_ENABLE_JAVA) -+ INSTALL(TARGETS pmjni -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) -+ endif(PORTMIDI_ENABLE_JAVA) - # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here - # INSTALL(FILES portmidi.h ../porttime/porttime.h - # DESTINATION /usr/local/include) ---- portmidi/pm_dylib/CMakeLists.txt -+++ portmidi/pm_dylib/CMakeLists.txt -@@ -39,9 +39,6 @@ - - # first include the appropriate system-dependent file: - if(UNIX) -- # add the -g switch for Linux and Mac OS X (not used in Win32) -- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" -- CACHE STRING "enable extra checks for debugging" FORCE) - if(APPLE) - set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) - prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) -@@ -63,7 +60,8 @@ - message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT}) - else(APPLE) - # LINUX settings... -- include(FindJNI) -+ if(PORTMIDI_ENABLE_JAVA) -+ include(FindJNI) - # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) - # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) - # note: should use JAVA_JVM_LIB_PATH, but it is not set properly -@@ -75,11 +73,8 @@ - # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH - # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation - # because JAVA_INCLUDE_PATH2 is pretty obscure) -- set(JAVA_INCLUDE_PATH ${JAVA_INCLUDE_PATH-UNKNOWN} -- CACHE STRING "where to find Java SDK include directory") -- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux) -- # libjvm.so is found relative to JAVA_INCLUDE_PATH: -- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so) -+ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}) -+ endif(PORTMIDI_ENABLE_JAVA) - - set(LINUXSRC pmlinuxalsa pmlinux finddefault) - prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC}) -@@ -91,13 +86,15 @@ - if(WIN32) - # /MDd is multithread debug DLL, /MTd is multithread debug - # /MD is multithread DLL, /MT is multithread -- -- include(FindJNI) -- # note: should use JAVA_JVM_LIB_PATH, but it is not set properly -- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib) - -- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) -- # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) -+ if(PORTMIDI_ENABLE_JAVA) -+ include(FindJNI) -+ # note: should use JAVA_JVM_LIB_PATH, but it is not set properly -+ set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib) -+ -+ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) -+ # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) -+ endif(PORTMIDI_ENABLE_JAVA) - - set(WINSRC pmwin pmwinmm) - prepend_path(LIBSRC ../pm_win/ ${WINSRC}) -@@ -106,7 +103,10 @@ - # message(STATUS "JAVAVM_LIB: " ${JAVAVM_LIB}) - endif(WIN32) - endif(UNIX) -+ -+if(PORTMIDI_ENABLE_JAVA) - set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVAVM_LIB}) -+endif(PORTMIDI_ENABLE_JAVA) - - # this completes the list of library sources by adding shared code - set(SHARED_FILES pmutil portmidi) -@@ -120,8 +120,8 @@ - # install the libraries (Linux and Mac OS X command line) - if(UNIX) - INSTALL(TARGETS portmidi-dynamic -- LIBRARY DESTINATION /usr/local/lib -- ARCHIVE DESTINATION /usr/local/lib) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) - INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h -- DESTINATION /usr/local/include) -+ DESTINATION include) - endif(UNIX) ---- portmidi/pm_java/CMakeLists.txt -+++ portmidi/pm_java/CMakeLists.txt -@@ -5,43 +5,24 @@ - # java not dealt with in CMake -- see pm_mac/pm_mac.xcodeproj - else(APPLE) - # linux -- set(JPORTMIDICLASS JPortMidi.class JPortMidiException.class -- JPortMidiApi.class) -- set(PMDEFAULTSCLASS PmDefaultsFrame.class PmDefaults.class) -- prepend_path(JPORTMIDICLASS2 jportmidi/ ${JPORTMIDICLASS}) -- prepend_path(PMDEFAULTSCLASS2 pmdefaults/ ${PMDEFAULTSCLASS}) -- set(PMDEFAULTS_ALL_CLASSES ${JPORTMIDICLASS2} ${PMDEFAULTSCLASS2}) -- # message(STATUS "PMDEFAULTS_ALL_CLASSES is " ${PMDEFAULTS_ALL_CLASSES}) -- add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class -- COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java -- MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java +diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt +--- portmidi.orig/pm_java/CMakeLists.txt 2009-11-04 16:20:44.000000000 +0100 ++++ portmidi/pm_java/CMakeLists.txt 2012-01-24 21:13:08.513182169 +0100 +@@ -15,13 +15,11 @@ if(UNIX) + add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class + COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java + MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java - DEPENDS pmdefaults/PmDefaults.java - WORKING_DIRECTORY pm_java) -- add_custom_command(OUTPUT pmdefaults/PmDefaults.class -- COMMAND javac -classpath . pmdefaults/PmDefaults.java -- MAIN_DEPENDENCY pmdefaults/PmDefaults.java ++ DEPENDS pmdefaults/PmDefaults.java) + add_custom_command(OUTPUT pmdefaults/PmDefaults.class + COMMAND javac -classpath . pmdefaults/PmDefaults.java + MAIN_DEPENDENCY pmdefaults/PmDefaults.java - DEPENDS pmdefaults/PmDefaultsFrame.java - WORKING_DIRECTORY pm_java) -- add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar -- COMMAND cp pmdefaults/portmusic_logo.png . -- COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar -- pmdefaults/*.class portmusic_logo.png jportmidi/*.class -- COMMAND chmod +x pmdefaults/pmdefaults -- COMMAND cp pmdefaults/pmdefaults ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} -- COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} -- COMMAND rm portmusic_logo.png -- MAIN_DEPENDENCY pmdefaults/PmDefaults.class ++ DEPENDS pmdefaults/PmDefaultsFrame.java) + add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar + COMMAND cp pmdefaults/portmusic_logo.png . + COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar +@@ -31,8 +29,7 @@ if(UNIX) + COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} + COMMAND rm portmusic_logo.png + MAIN_DEPENDENCY pmdefaults/PmDefaults.class - DEPENDS ${PMDEFAULTS_ALL_CLASSES} - WORKING_DIRECTORY pm_java) -- add_custom_target(pmdefaults_target ALL -- DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) -- # message(STATUS "add_custom_target: pmdefaults.jar") -+ set(JAVA_CLASSES jportmidi pmdefaults) -+ add_custom_command(OUTPUT ${JAVA_CLASSES} -+ COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} jportmidi/*.java pmdefaults/*.java -+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar -+ DEPENDS ${JAVA_CLASSES} -+ COMMAND jar cmf pmdefaults/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar -+ -C pmdefaults portmusic_logo.png -C ${CMAKE_CURRENT_BINARY_DIR} jportmidi -+ -C ${CMAKE_CURRENT_BINARY_DIR} pmdefaults -+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -+ add_custom_target(pmdefaults.jar ALL -+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar) - - # install the libraries (Linux only) -- INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar -- DESTINATION /usr/share/java) -- INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults -- DESTINATION /usr/local/bin) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar -+ DESTINATION ${JAR_INSTALL_DIR}) -+ INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/pmdefaults/pmdefaults -+ DESTINATION bin) - endif(APPLE) - endif(UNIX) - # In windows, use pm_java/make.bat ---- portmidi/pm_test/CMakeLists.txt -+++ portmidi/pm_test/CMakeLists.txt -@@ -12,8 +12,8 @@ - - macro(make_a_test name) - add_executable(${name} ${name}.c) -- target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS}) -- add_dependencies(${name} portmidi-static) -+ target_link_libraries(${name} portmidi ${PM_NEEDED_LIBS}) -+ add_dependencies(${name} portmidi) - endmacro(make_a_test) - - make_a_test(test) ++ DEPENDS ${PMDEFAULTS_ALL_CLASSES}) + add_custom_target(pmdefaults_target ALL + DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) + # message(STATUS "add_custom_target: pmdefaults.jar") diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index 333aa390b..34d4112fc 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 192411 2013-08-10 21:15:00Z eric $ +# $Id: PKGBUILD 197435 2013-10-25 22:16:33Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket pkgver=5.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64') url="http://racket-lang.org/" license=('LGPL') depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('gsfonts' 'sqlite') -options=('!libtool' '!strip') +options=('!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz drracket.desktop) @@ -28,9 +28,11 @@ package() { cd ${pkgname}-${pkgver}/src make DESTDIR="${pkgdir}" install - install -d "${pkgdir}"/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps + install -d "${pkgdir}"/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps ln -s /usr/lib/racket/collects/icons/plt-16x16.png "${pkgdir}/usr/share/icons/hicolor/16x16/apps/drracket.png" ln -s /usr/lib/racket/collects/icons/plt-32x32.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/drracket.png" ln -s /usr/lib/racket/collects/icons/plt-48x48.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/drracket.png" + ln -s /usr/lib/racket/collects/icons/plt-logo-red-diffuse.png "${pkgdir}/usr/share/icons/hicolor/256x256/apps/drracket.png" + install -D -m644 "${srcdir}/drracket.desktop" "${pkgdir}/usr/share/applications/drracket.desktop" } diff --git a/extra/sdl2/PKGBUILD b/extra/sdl2/PKGBUILD index 0119dd5b9..76aa6c8c0 100644 --- a/extra/sdl2/PKGBUILD +++ b/extra/sdl2/PKGBUILD @@ -1,34 +1,34 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=sdl2 pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)" arch=('i686' 'x86_64') url="http://www.libsdl.org" license=('MIT') depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl') -makedepends=('alsa-lib' 'mesa' 'libpulse' 'cmake' 'libxrandr' 'libxinerama') +makedepends=('alsa-lib' 'mesa' 'libpulse' 'libxrandr' 'libxinerama') optdepends=('alsa-lib: ALSA audio driver' 'libpulse: PulseAudio audio driver') source=("http://www.libsdl.org/release/SDL2-${pkgver}.tar.gz") md5sums=('0eb97039488bf463e775295f7b18b227') -build() { - cd "${srcdir}/SDL2-${pkgver}" - - mkdir build && cd build +prepare() { + mkdir build +} - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSDL_STATIC=OFF \ - -DRPATH=OFF +build() { + cd build + ../SDL2-$pkgver/configure --prefix=/usr \ + --enable-sdl-dlopen \ + --disable-arts --disable-esd --disable-nas \ + --enable-alsa --enable-pulseaudio-shared \ + --disable-rpath make } package() { - cd "${srcdir}/SDL2-${pkgver}/build" - - make DESTDIR="${pkgdir}/" install - - install -Dm644 ../COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + cd build + make DESTDIR="$pkgdir" install + install -Dm644 ../SDL2-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/sdl2_gfx/PKGBUILD b/extra/sdl2_gfx/PKGBUILD index b302c886a..d9e7a924b 100644 --- a/extra/sdl2_gfx/PKGBUILD +++ b/extra/sdl2_gfx/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Jameson Pugh <imntreal@gmail.com> pkgname=sdl2_gfx -pkgver=5 +pkgver=7 pkgrel=1 pkgdesc="SDL Graphic Primitives (Version 2)" arch=('i686' 'x86_64') diff --git a/extra/sdl2_image/PKGBUILD b/extra/sdl2_image/PKGBUILD index fc17b5d2d..f8db10005 100644 --- a/extra/sdl2_image/PKGBUILD +++ b/extra/sdl2_image/PKGBUILD @@ -2,16 +2,16 @@ pkgname=sdl2_image pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A simple library to load images of various formats as SDL surfaces (Version 2)" arch=('i686' 'x86_64') -url="http://www.libsdl.org" +url="http://www.libsdl.org/projects/SDL_image" license=('MIT') depends=('sdl2' 'libpng' 'libtiff' 'libjpeg' 'libwebp') makedepends=('cmake') options=(!libtool) -source=("http://www.libsdl.org/tmp/SDL_image/release/SDL2_image-${pkgver}.tar.gz") -sha1sums=('1a37f0f63421bd1b86dd6ddabcb04fa8f28874ce') +source=("$url/release/SDL2_image-${pkgver}.tar.gz") +sha1sums=('20b1b0db9dd540d6d5e40c7da8a39c6a81248865') build() { cd "${srcdir}/SDL2_image-${pkgver}/" diff --git a/extra/sdl2_mixer/PKGBUILD b/extra/sdl2_mixer/PKGBUILD index 760fee8a7..1b89a1ff1 100644 --- a/extra/sdl2_mixer/PKGBUILD +++ b/extra/sdl2_mixer/PKGBUILD @@ -1,18 +1,19 @@ -#Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# $Id: PKGBUILD 197551 2013-10-26 19:51:20Z heftig $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=sdl2_mixer pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A simple multi-channel audio mixer (Version 2)" arch=('i686' 'x86_64') -url="http://www.libsdl.org" +url="http://www.libsdl.org/projects/SDL_mixer" license=('MIT') depends=('sdl2' 'libvorbis' 'libmodplug' 'smpeg2' 'flac') makedepends=('fluidsynth') optdepends=('fluidsynth: MIDI software synth, replaces built-in timidity') options=(!libtool) -source=("http://www.libsdl.org/tmp/SDL_mixer/release/SDL2_mixer-${pkgver}.tar.gz") -md5sums=('4c85cdc7b6d162afb918aed626436109') +source=("$url/release/SDL2_mixer-${pkgver}.tar.gz") +md5sums=('65f6d80df073a1fb3bb537fbda031b50') build() { cd "${srcdir}/SDL2_mixer-${pkgver}/" diff --git a/extra/sdl2_net/PKGBUILD b/extra/sdl2_net/PKGBUILD index 6deb7d889..0d2a10d35 100644 --- a/extra/sdl2_net/PKGBUILD +++ b/extra/sdl2_net/PKGBUILD @@ -1,30 +1,29 @@ +# $Id: PKGBUILD 197552 2013-10-26 19:51:20Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=sdl2_net -pkgver=249 +epoch=1 +pkgver=2.0.0 pkgrel=1 pkgdesc="A small sample cross-platform networking library (Version 2)" arch=('i686' 'x86_64') -url="http://www.libsdl.org" +url="http://www.libsdl.org/projects/SDL_net" license=('MIT') depends=(sdl2) -makedepends=(mercurial) options=(!libtool) -source=("sdl2_net::hg+http://hg.libsdl.org/SDL_net#revision=$pkgver") -md5sums=('SKIP') +source=("$url/release/SDL2_net-${pkgver}.tar.gz") +md5sums=('83bcd0e67796b81b35b08a014c677200') build() { - cd "${srcdir}/sdl2_net/" + cd "${srcdir}/SDL2_net-${pkgver}/" - ./autogen.sh ./configure --disable-static --prefix=/usr make } package() { - cd "${srcdir}/sdl2_net/" - - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/SDL2_net-${pkgver}/" + make DESTDIR="${pkgdir}" install install -Dm644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/sdl2_ttf/PKGBUILD b/extra/sdl2_ttf/PKGBUILD index fe743318c..5f7bcc8eb 100644 --- a/extra/sdl2_ttf/PKGBUILD +++ b/extra/sdl2_ttf/PKGBUILD @@ -1,23 +1,22 @@ +# $Id: PKGBUILD 197553 2013-10-26 19:51:21Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=sdl2_ttf pkgver=2.0.12 -pkgrel=1 +pkgrel=2 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (Version 2)" arch=('i686' 'x86_64') -url="http://www.libsdl.org" +url="http://www.libsdl.org/projects/SDL_ttf" license=('MIT') depends=('sdl2' 'freetype2') makedepends=('cmake') -provides=(sdl2_ttf) options=(!libtool) -source=("http://www.libsdl.org/tmp/SDL_ttf/release/SDL2_ttf-${pkgver}.tar.gz") -md5sums=('a0925e117cc5f0fb7cf2a66c7968c117') +source=("$url/release/SDL2_ttf-${pkgver}.tar.gz") +md5sums=('79787216b56cb4707f39d538f2225e00') build() { cd "${srcdir}/SDL2_ttf-${pkgver}/" - ./autogen.sh ./configure --disable-static --prefix=/usr make } @@ -26,6 +25,5 @@ package() { cd "${srcdir}/SDL2_ttf-${pkgver}/" make DESTDIR="${pkgdir}/" install - install -Dm644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/shared-mime-info/PKGBUILD b/extra/shared-mime-info/PKGBUILD index baefc4cb6..014f72778 100644 --- a/extra/shared-mime-info/PKGBUILD +++ b/extra/shared-mime-info/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178164 2013-02-17 17:13:54Z andyrtr $ +# $Id: PKGBUILD 197506 2013-10-26 08:14:56Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=shared-mime-info -pkgver=1.1 +pkgver=1.2 pkgrel=1 pkgdesc="Freedesktop.org Shared MIME Info" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('intltool' 'pkgconfig') install=shared-mime-info.install url="http://freedesktop.org/Software/shared-mime-info" source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.xz) -md5sums=('12ba00bf1cb2e69bfba73127e708e833') +md5sums=('8f90f3f2b8478fa47e70678d34013f99') options=(!makeflags) build() { diff --git a/extra/shared-mime-info/pbm.patch b/extra/shared-mime-info/pbm.patch deleted file mode 100644 index 95f9ab81f..000000000 --- a/extra/shared-mime-info/pbm.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur shared-mime-info-0.70-orig/freedesktop.org.xml shared-mime-info-0.70/freedesktop.org.xml ---- shared-mime-info-0.70-orig/freedesktop.org.xml 2010-02-06 02:39:24.000000000 -0500 -+++ shared-mime-info-0.70/freedesktop.org.xml 2010-02-06 02:48:01.000000000 -0500 -@@ -17025,12 +17025,10 @@ - <magic priority="50"> - <match value="P1" type="string" offset="0"> - <match value="0x0a" type="byte" offset="2"> -- <match value="#" type="string" offset="3"/> - </match> - </match> - <match value="P4" type="string" offset="0"> - <match value="0x0a" type="byte" offset="2"> -- <match value="#" type="string" offset="3"/> - </match> - </match> - </magic> -@@ -17074,12 +17072,10 @@ - <magic priority="50"> - <match value="P2" type="string" offset="0"> - <match value="0x0a" type="byte" offset="2"> -- <match value="#" type="string" offset="3"/> - </match> - </match> - <match value="P5" type="string" offset="0"> - <match value="0x0a" type="byte" offset="2"> -- <match value="#" type="string" offset="3"/> - </match> - </match> - </magic> -@@ -17123,12 +17119,10 @@ - <magic priority="50"> - <match value="P3" type="string" offset="0"> - <match value="0x0a" type="byte" offset="2"> -- <match value="#" type="string" offset="3"/> - </match> - </match> - <match value="P6" type="string" offset="0"> - <match value="0x0a" type="byte" offset="2"> -- <match value="#" type="string" offset="3"/> - </match> - </match> - </magic> diff --git a/extra/slang/PKGBUILD b/extra/slang/PKGBUILD index 2043a8d95..d2e18936f 100644 --- a/extra/slang/PKGBUILD +++ b/extra/slang/PKGBUILD @@ -1,34 +1,33 @@ -# $Id: PKGBUILD 149970 2012-02-11 23:31:28Z allan $ +# $Id: PKGBUILD 197459 2013-10-26 07:19:12Z eric $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=slang pkgver=2.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="S-Lang is a powerful interpreted language" arch=('i686' 'x86_64') url="http://www.jedsoft.org/slang/" license=('GPL') -depends=('glibc' 'pcre' 'zlib') +depends=('pcre' 'zlib') backup=('etc/slsh.rc') options=('!makeflags') source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2{,.asc}) md5sums=('7fcfd447e378f07dd0c0bae671fe6487' - '0e37091fe52b4ef609c3cee8eda0e101') + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install-all } diff --git a/extra/smpeg2/PKGBUILD b/extra/smpeg2/PKGBUILD index 1f7dd4856..99d59b4ee 100644 --- a/extra/smpeg2/PKGBUILD +++ b/extra/smpeg2/PKGBUILD @@ -1,29 +1,28 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=smpeg2 -pkgver=412 -pkgrel=2 +epoch=1 +pkgver=2.0.0 +pkgrel=1 pkgdesc="SDL2 MPEG Player Library" arch=('i686' 'x86_64') url="http://icculus.org/smpeg/" license=('LGPL') -depends=('sdl2') -makedepends=('gtk' 'mesa' 'glu' 'svn') -optdepends=('gtk: to use gtv ' 'glu: to use glmovie') +depends=('sdl2' 'gcc-libs') +makedepends=('svn') options=('!libtool') -source=(svn://svn.icculus.org/smpeg/trunk#revision=$pkgver) +source=("${pkgname}::svn://svn.icculus.org/smpeg/tags/release_${pkgver//./_}") md5sums=('SKIP') build() { - cd ${srcdir}/trunk - sed -i s/SDL_CONFIG/SDL2_CONFIG/g smpeg2-config.in + cd ${srcdir}/${pkgname} ./autogen.sh ./configure --prefix=/usr --mandir=/usr/share/man --disable-static make } package() { - cd ${srcdir}/trunk + cd ${srcdir}/${pkgname} make DESTDIR=${pkgdir} install # hacky way of resolving conflicts diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD index 132f21c4b..f88f7cc21 100644 --- a/extra/ucommon/PKGBUILD +++ b/extra/ucommon/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 194209 2013-09-10 14:36:48Z bpiotrowski $ +# $Id: PKGBUILD 197457 2013-10-26 07:03:21Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ucommon pkgver=6.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" arch=('i686' 'x86_64') url="http://www.gnutelephony.org/index.php/GNU_uCommon_C++" license=('GPL3' 'LGPL3') depends=('openssl') -options=('!libtool') -source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) +source=(http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz{,.sig}) md5sums=('0774a0315beac7b26ec75d44d925f208' 'SKIP') diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD index 9fd15ea08..efcfdae64 100644 --- a/extra/vcdimager/PKGBUILD +++ b/extra/vcdimager/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 175148 2013-01-15 11:34:24Z jgc $ +# $Id: PKGBUILD 197455 2013-10-26 06:55:11Z eric $ # Maintainer: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vcdimager pkgver=0.7.24 -pkgrel=3 +pkgrel=4 pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's" arch=('i686' 'x86_64') url="http://www.vcdimager.org/" license=('GPL') depends=('libcdio' 'libxml2' 'popt') -options=('!libtool') install=vcdimager.install source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz vcdimager-0.7.24-libcdio-0.83.patch) md5sums=('3af22978fd79c79d5fda6513b6811145' 'f4e7376fd9d975951d2b93a5e9123fdc') +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "$srcdir/vcdimager-0.7.24-libcdio-0.83.patch" +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/vcdimager-0.7.24-libcdio-0.83.patch + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 21edadbfc..304d3f905 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 196806 2013-10-19 13:44:27Z bpiotrowski $ +# $Id: PKGBUILD 197516 2013-10-26 12:19:28Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgbase=vigra pkgname=('vigra' 'vigra-doc') pkgver=1.9.0 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') makedepends=(# runtime deps - 'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.11' 'fftw' - # additional makedeps + 'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw' + # additional makedeps 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 'python2-numpy') -options=('!libtool') source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz) md5sums=('b6155afe1ea967917d2be16d98a85404') @@ -34,7 +33,7 @@ check() { package_vigra() { pkgdesc="Computer vision library" - depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.11' 'fftw') + depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw') optdepends=('python2: for python bindings' 'boost-libs: for python bindings') diff --git a/extra/wavpack/PKGBUILD b/extra/wavpack/PKGBUILD index c27e4dccb..d7e40ce6c 100644 --- a/extra/wavpack/PKGBUILD +++ b/extra/wavpack/PKGBUILD @@ -1,33 +1,28 @@ -# $Id: PKGBUILD 146400 2012-01-10 20:33:06Z andrea $ +# $Id: PKGBUILD 197443 2013-10-26 02:06:11Z eric $ # Maintainer: # Contributor: François Charette <firmicus ατ gmx δοτ net> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> # Contributor: Michal Hybner <dta081@gmail.com> pkgname=wavpack -pkgver=4.60.1 -pkgrel=2 -pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes" +pkgver=4.70.0 +pkgrel=1 +pkgdesc="Audio compression format with lossless, lossy and hybrid compression modes" arch=('i686' 'x86_64') url="http://www.wavpack.com/" -license=('custom') +license=('BSD') depends=('glibc') -options=('!libtool') source=("http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7bb1528f910e4d0003426c02db856063') +sha1sums=('7bf2022c988c19067196ee1fdadc919baacf46d1') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --enable-mmx \ - --disable-static + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --enable-mmx make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - install -Dm644 license.txt \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/xfce4-mailwatch-plugin/PKGBUILD b/extra/xfce4-mailwatch-plugin/PKGBUILD index c5a614ce0..f0b8ff2ae 100644 --- a/extra/xfce4-mailwatch-plugin/PKGBUILD +++ b/extra/xfce4-mailwatch-plugin/PKGBUILD @@ -1,42 +1,32 @@ -# $Id: PKGBUILD 157861 2012-04-30 04:20:30Z foutrelis $ +# $Id: PKGBUILD 197445 2013-10-26 02:49:51Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Suzy Williams <suzanne.williams3@verizon.net> pkgname=xfce4-mailwatch-plugin -pkgver=1.1.0 -pkgrel=5 +pkgver=1.2.0 +pkgrel=1 pkgdesc="A mailbox watch/check plugin for the Xfce4 panel" -arch=(i686 x86_64) +arch=('i686' 'x86_64') +url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin" license=('GPL2') -url="http://spurint.org/projects/xfce4-mailwatch-plugin/" groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'gnutls' 'libgcrypt' 'hicolor-icon-theme') -makedepends=('intltool' 'xfce4-dev-tools') -options=('!libtool') +depends=('xfce4-panel') +makedepends=('intltool') install=${pkgname}.install -source=(http://spuriousinterrupt.org/files/mailwatch/${pkgname}-${pkgver}.tar.bz2 - xfce4-mailwatch-plugin-1.1.0-underlink.patch - only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch) -md5sums=('f84dce86be1d7f25f169f262aaacee4e' - '47fe8588e3bb642e1b507a854927e6db' - 'd91ca2b9534e9e2d8dcbd94306b91ade') +source=(http://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('7263114ec0f2987a3aff15afeeb45577') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i ${srcdir}/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch - # fix for panel4.8 from Fedora - patch -Np1 -i ${srcdir}/xfce4-mailwatch-plugin-1.1.0-underlink.patch - xdt-autogen + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ - --disable-static \ --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch b/extra/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch deleted file mode 100644 index 349e78555..000000000 --- a/extra/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- libmailwatch-core/mailwatch-net-conn.c.orig 2012-04-29 05:38:20.015564589 +0300 -+++ libmailwatch-core/mailwatch-net-conn.c 2012-04-29 05:39:01.943290639 +0300 -@@ -621,8 +621,10 @@ xfce_mailwatch_net_conn_make_secure(Xfce - net_conn->gt_creds); - gnutls_transport_set_ptr(net_conn->gt_session, - (gnutls_transport_ptr_t)net_conn->fd); -+#if GNUTLS_VERSION_NUMBER < 0x020c00 - if(fcntl(net_conn->fd, F_GETFL) & O_NONBLOCK) - gnutls_transport_set_lowat(net_conn->gt_session, 0); -+#endif - - if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error)) { - #if 0 diff --git a/extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch b/extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch deleted file mode 100644 index ada0df041..000000000 --- a/extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am 2008-08-26 03:42:36.000000000 +0100 -+++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am.new 2011-01-14 17:27:44.116199383 +0000 -@@ -50,6 +50,7 @@ - -I$(top_srcdir)/libmailwatch-core \ - @GTHREAD_CFLAGS@ \ - @LIBXFCE4PANEL_CFLAGS@ \ -+ @LIBXFCEGUI4_CFLAGS@ \ - -DDATADIR=\"$(datadir)\" \ - -DLOCALEDIR=\"$(localedir)\" - -@@ -60,7 +61,9 @@ - $(top_builddir)/libmailwatch-core/libmailwatch-core.la \ - @GTHREAD_LIBS@ \ - @LIBXFCE4PANEL_LIBS@ \ -- @GNUTLS_LIBS@ -+ @LIBXFCEGUI4_LIBS@ \ -+ @GNUTLS_LIBS@ \ -+ -lgcrypt - - if HAVE_CYGWIN - xfce4_mailwatch_plugin_LDFLAGS += \ diff --git a/extra/yasm/PKGBUILD b/extra/yasm/PKGBUILD index d1096c2ff..3c229a87a 100644 --- a/extra/yasm/PKGBUILD +++ b/extra/yasm/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 157779 2012-04-29 10:55:02Z allan $ -# Maintainer: Роман Кирилич (Roman Kyrylych) <roman@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: Vinay S Shastry <vinayshastry@gmail.com> +# $Id: PKGBUILD 197451 2013-10-26 06:45:33Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=yasm pkgver=1.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" arch=('i686' 'x86_64') -license=('custom') url="http://www.tortall.net/projects/yasm/" +license=('BSD' 'GPL2' 'LGPL2.1' 'PerlArtistic') depends=('glibc') +options=('staticlibs') source=(http://www.tortall.net/projects/yasm/releases/${pkgname}-${pkgver}.tar.gz) -options=('!libtool') -md5sums=('4cfc0686cf5350dd1305c4d905eb55a6') +sha1sums=('773d28f27f83c44ac35079add0d3167ca6c1def8') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 BSD.txt "${pkgdir}/usr/share/licenses/${pkgname}/BSD.txt" } diff --git a/extra/zziplib/PKGBUILD b/extra/zziplib/PKGBUILD index 1dfd249fd..0e4077123 100644 --- a/extra/zziplib/PKGBUILD +++ b/extra/zziplib/PKGBUILD @@ -1,30 +1,29 @@ -# $Id: PKGBUILD 153578 2012-03-16 06:20:51Z eric $ +# $Id: PKGBUILD 197447 2013-10-26 06:24:44Z eric $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> pkgname=zziplib pkgver=0.13.62 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight library that offers the ability to easily extract data from files archived in a single zip file" arch=('i686' 'x86_64') url="http://zziplib.sourceforge.net" license=('LGPL' 'MPL') depends=('zlib') makedepends=('python2') -options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) md5sums=('5fe874946390f939ee8f4abe9624b96c') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} export PYTHON=/usr/bin/python2 ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install #fix permission |