From e5076aa0858181ca6ca50cdf62b099a76e984a2c Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Thu, 16 May 2013 16:39:09 +0200 Subject: Unarch mplayer-libre and mplayer-vaapi-libre from mips64el. No need for them when mplayer2 is available, while no one built it successfully. vaapi needs GPU acceleration not available on mips64el machines that we have unless using nonfree firmware. --- libre/mplayer-libre/PKGBUILD | 2 +- libre/mplayer-vaapi-libre/PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index ffd2362be..73f1135e0 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=35920 pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion') diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 93958ca69..023b703b4 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mplayer-vaapi-libre pkgver=35107 pkgrel=7 pkgdesc="A movie player, compiled with vaapi, without nonfree faac support" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" license=('GPL') depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' -- cgit v1.2.3 From b52785d38e3ac1bc85c2454870c354846ed78b50 Mon Sep 17 00:00:00 2001 From: Guest One Date: Thu, 16 May 2013 18:55:08 +0200 Subject: added new package minaton-lv2 0.0.3-1 --- pcr/minaton-lv2/PKGBUILD | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pcr/minaton-lv2/PKGBUILD diff --git a/pcr/minaton-lv2/PKGBUILD b/pcr/minaton-lv2/PKGBUILD new file mode 100644 index 000000000..797a74653 --- /dev/null +++ b/pcr/minaton-lv2/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Guest One +pkgname=minaton-lv2 +pkgver=0.0.3 +pkgrel=1 +pkgdesc="A music software synthesizer project, LV2 instrument." +arch=('i686') +url="http://sourceforge.net/p/minaton/home/Home/" +license=('GPL') +groups=('lv2-plugins') +depends=('lv2' 'jack' 'gtkmm') +makedepends=('lv2-c++-tools') +provides=('lv2-minaton') +conflicts=('lv2-minaton') +source=("http://downloads.sourceforge.net/project/minaton/$pkgname-v.$pkgver.tar.gz") +md5sums=('b5190a6c6942c1a1fe6b929963ad1f86') + +build() { + cd "$srcdir/$pkgname-v$pkgver" + + # set bundle_path + sed -i "s|\(string bundle_path\);|\1 = \"/usr/lib/lv2/minaton.lv2/\";|" *.{hpp,h,cpp} + + make +} + +package() { + cd "$srcdir/$pkgname-v$pkgver" + make INSTALL_DIR="$pkgdir/usr/lib/lv2" install +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3 From ee473c2513aeb81ba7ce9f47844f3e4b752a6004 Mon Sep 17 00:00:00 2001 From: Guest One Date: Thu, 16 May 2013 23:24:10 +0200 Subject: added new package petri-foo 0.1.87-1 --- pcr/petri-foo/PKGBUILD | 31 ++++++++++++++++++++++ ...etri-foo-0.1.87_fix_recent_file_not_exist.patch | 24 +++++++++++++++++ pcr/petri-foo/petri-foo.install | 19 +++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 pcr/petri-foo/PKGBUILD create mode 100644 pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch create mode 100644 pcr/petri-foo/petri-foo.install diff --git a/pcr/petri-foo/PKGBUILD b/pcr/petri-foo/PKGBUILD new file mode 100644 index 000000000..72ca1e45a --- /dev/null +++ b/pcr/petri-foo/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Guest One +# patch taken from https://aur.archlinux.org/packages/petri-foo/ +pkgname=petri-foo +pkgver=0.1.87 +pkgrel=1 +pkgdesc="A fork of specimen, a MIDI controllable audio sampler, for JACK." +arch=('i686') +url="http://petri-foo.sourceforge.net/" +license=('GPL2') +depends=('jack' 'libgnomecanvas') +makedepends=('cmake') +optdepends=('liblo: Non Session Manager support') +install='petri-foo.install' +source=(http://sourceforge.net/projects/${pkgname}/files/Source/${pkgname}-${pkgver}.tar.bz2 + petri-foo-0.1.87_fix_recent_file_not_exist.patch) +md5sums=('40f8a224368187672f9f306f8a4fa8c5' + '964db40cc53d77d42f6593f2201b9c40') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 < ../petri-foo-0.1.87_fix_recent_file_not_exist.patch + cmake -DCMAKE_INSTALL_PREFIX=/usr -DUpdateMime:BOOL=OFF . + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch b/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch new file mode 100644 index 000000000..3e88487b0 --- /dev/null +++ b/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch @@ -0,0 +1,24 @@ +diff -Naur a/gui/bank-ops.c b/gui/bank-ops.c +--- a/gui/bank-ops.c 2012-08-06 05:33:34.000000000 +0200 ++++ b/gui/bank-ops.c 2012-08-07 17:57:28.580145691 +0200 +@@ -393,6 +393,8 @@ + g_signal_connect_swapped(G_OBJECT(msg), "response", + G_CALLBACK(gtk_widget_destroy), msg); + gtk_widget_show (msg); ++ ++ gtk_recent_manager_remove_item(recent_manager, filename, NULL); + } + else + { +diff -Naur a/libpetrifui/dish_file.c b/libpetrifui/dish_file.c +--- a/libpetrifui/dish_file.c 2012-08-06 05:33:34.000000000 +0200 ++++ b/libpetrifui/dish_file.c 2012-08-07 17:56:09.063909801 +0200 +@@ -1440,7 +1440,7 @@ + + if (stat(path, &st) != 0) + { +- msg_log(MSG_ERROR, "file '%s' does not exist\n"); ++ msg_log(MSG_ERROR, "file '%s' does not exist\n", path); + return -1; + } + diff --git a/pcr/petri-foo/petri-foo.install b/pcr/petri-foo/petri-foo.install new file mode 100644 index 000000000..5dd24bbe5 --- /dev/null +++ b/pcr/petri-foo/petri-foo.install @@ -0,0 +1,19 @@ +updatedesktopdtb() { + [ -x /usr/bin/update-desktop-database ] \ + && update-desktop-database -q + [ -x /usr/bin/update-mime-database ] \ + && update-mime-database usr/share/mime > /dev/null 2>&1 +} + +post_install() { + updatedesktopdtb +} + +post_upgrade() { + updatedesktopdtb +} + +post_remove() { + updatedesktopdtb +} + -- cgit v1.2.3 From faf070b2ed37b3c4336c37e15b8f572066489938 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 16 May 2013 17:55:52 -0400 Subject: updating spree in [java] --- java-ugly/maven/PKGBUILD | 91 ++++++++++++++++++++----------- java/antlr2/PKGBUILD | 100 +++++++++++++++++++++++++++++++++++ java/antlr2/gcc4.4.patch | 12 +++++ java/antlr2/mono.patch | 31 +++++++++++ java/antlr2/runantlr2.sh | 5 ++ java/java-asm2/PKGBUILD | 6 +-- java/java-asm2/PKGBUILD-bootstrap | 1 + java/java-asm2/common.sh | 22 +++++--- java/java-asm3/PKGBUILD | 6 +-- java/java-ow-util-ant-tasks/PKGBUILD | 22 ++++++-- java/java-ow-util-ant-tasks/SRCBUILD | 29 ---------- java/jh/PKGBUILD | 4 +- java/nant/PKGBUILD | 19 +++++++ 13 files changed, 269 insertions(+), 79 deletions(-) create mode 100644 java/antlr2/PKGBUILD create mode 100644 java/antlr2/gcc4.4.patch create mode 100644 java/antlr2/mono.patch create mode 100644 java/antlr2/runantlr2.sh delete mode 100644 java/java-ow-util-ant-tasks/SRCBUILD create mode 100644 java/nant/PKGBUILD diff --git a/java-ugly/maven/PKGBUILD b/java-ugly/maven/PKGBUILD index 2bd99940e..3f8e5071d 100644 --- a/java-ugly/maven/PKGBUILD +++ b/java-ugly/maven/PKGBUILD @@ -2,51 +2,72 @@ # Maintainer (Arch): Sergej Pupykin # Contributor: William Rea -_pkgname=maven -pkgname=maven-libre -pkgver=3.0.4 +pkgname=maven +pkgver=3.0.5 +pkgdesc="A Java project management and project comprehension tool" +url="http://maven.apache.org" +license=('Apache') -provides=("$_pkgname=$pkgver") -replaces=("$_pkgname") -conflicts=("$_pkgname") +replaces=('maven-libre') +conflicts=('maven-libre') pkgrel=1 -pkgdesc="A Java project management and project comprehension tool" arch=('any') -url="http://maven.apache.org" -license=('Apache') -depends=('java-environment') -makedepends=('apache-ant') +options=(!emptydirs) +conflicts=('maven') +depends=('java-environment' 'sh') +makedepends=('apache-ant' 'jh' 'imake' + java-antlr2 + java-asm3 +) backup=('etc/maven/settings.xml') _mirror=http://archive.apache.org/dist -source=($_mirror/maven/source/apache-maven-$pkgver-src.tar.gz +source=($_mirror/maven/maven-${pkgver%%.*}/$pkgver/source/apache-maven-$pkgver-src.tar.gz maven.sh maven.csh) -_M2_LOCALREPO="/usr/share/maven/repository" - -# FIXME: This also does tasks for package() -build() { - cd $srcdir/apache-maven-$pkgver - +_setup_env() { + unset _JAVA_OPTIONS . /etc/profile.d/jre.sh . /etc/profile.d/jdk.sh - export MAVEN_OPTS=-Xmx512m export M2_HOME="$pkgdir"/opt/maven export PATH="$PATH:$M2_HOME/bin" + _M2_LOCALREPO=$(jh mvn-localrepo) + ant_args=( + -Dmaven.repo.local="$srcdir"/maven.repo.local + ) +} - # FIXME: Downloads many deps from Internet. They should be - # packaged separately and added to depends=() - install -d "$pkgdir`dirname $_M2_LOCALREPO`" - cp -r $_M2_LOCALREPO "$pkgdir$_M2_LOCALREPO" - install -d "$pkgdir"/opt - ant -Dmaven.repo.local="$pkgdir$_M2_LOCALREPO" - rm "$pkgdir"/opt/maven/*.txt +prepare() { + if type mvn &>/dev/null; then + error "maven cannot be built while an existing version is installed" + return 1 + fi } -package() { - install -d "$pkgdir$_M2_LOCALREPO" +build() ( + _setup_env + install -d "$srcdir"/maven.repo.local + lndir "$_M2_LOCALREPO" "$srcdir"/maven.repo.local + + cd "$srcdir"/apache-maven-$pkgver + + # FIXME: downloads makedepends from the Internet. Add them to makedepends=() + ant "${ant_args[@]}" maven-assembly 2>&1|tee "$srcdir"/ant-log.txt + + < "$srcdir"/ant-log.txt \ + sed -nr 's/.*Download(ed|ing):\s*//p' | \ + sed 's/ .*//' | \ + sed -r -e 's|^http://repo.maven.apache.org/maven2/||' -e 's/\.(jar|pom)$//' | \ + sort -u > "$srcdir"/downloaded-artifacts.txt +) + +package() ( + _setup_env + cd "$srcdir"/apache-maven-$pkgver + ant "${ant_args[@]}" extract-assembly + #rm "$pkgdir"/opt/maven/*.txt # Install config file in /etc # Unlike the other directories, we symlink from the system to /opt/maven @@ -69,8 +90,18 @@ package() { # Link jar files to appropriate place in /usr/share install -d "$pkgdir"/usr/share/java ln -s /opt/maven/lib "$pkgdir"/usr/share/java/maven -} -md5sums=('17ca94d5be05a78c6ab12425b7a0ee10' + # Install the local repo + mkdir -p "$pkgdir"${_M2_LOCALREPO%/*} + cp -a "$srcdir"/maven.repo.local "$pkgdir"$_M2_LOCALREPO + # Remove extra artifacts + find "$pkgdir"$_M2_LOCALREPO -type l -delete + find "$pkgdir"$_M2_LOCALREPO -name _maven.repositories -delete + cat "$srcdir"/downloaded-artifacts.txt | while read artifact; do + rm -f "$pkgdir"$_M2_LOCALREPO/$artifact* + done +) + +md5sums=('b88becd8fe5a9665191e05945942db64' '58820067a4d7384477daa134023d9b57' 'e2bbdeffed100cd51d05b2ba8ebd6321') diff --git a/java/antlr2/PKGBUILD b/java/antlr2/PKGBUILD new file mode 100644 index 000000000..4269d30c7 --- /dev/null +++ b/java/antlr2/PKGBUILD @@ -0,0 +1,100 @@ +# $Id: PKGBUILD 167380 2012-10-01 19:24:15Z guillaume $ +# Maintainer: Andrea Scarpino +# Contributor: George Giorgidze +# Contributor: Stefan Husmann + +pkgbase=antlr2 +pkgname=(antlr2 antlr2-{java,python2,cxx,sharp}) +pkgver=2.7.7 +url="http://www.antlr2.org/" +license=('custom:Public Domain') + +pkgrel=3 +arch=('i686' 'x86_64') +makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh') +source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz" + "http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom" + 'runantlr2.sh' 'gcc4.4.patch' 'mono.patch') + +build() { + cd "${srcdir}/antlr-${pkgver}" + + patch -Np1 -i "${srcdir}"/gcc4.4.patch + patch -Np1 -i "${srcdir}"/mono.patch + + ./configure --prefix=/usr --disable-examples + make -j1 + + cd lib/csharp + nant release +} + +_install_license() { + install -Dm644 "$srcdir"/antlr-${pkgver}/LICENSE.txt \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_antlr2() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)" + depends=('sh' 'antlr2-java') + + install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2 + _install_license +} + +package_antlr2-java() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Java version)" + depends=('java-runtime') + + provides=("java-antlr2=$pkgver") + conflicts=("java-antlr2") + replaces=("java-antlr2") + + DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \ + "$srcdir"/antlr-${pkgver}.pom \ + "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \ + antlr2.jar + + _install_license +} + +package_antlr2-python2() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Python version)" + depends=('antlr2' 'python2') + + provides=("python2-antlr2=$pkgver") + conflicts=("python2-antlr2") + replaces=("python2-antlr2") + + cd "$srcdir"/antlr-${pkgver}/lib/python + python2 setup.py install --root="${pkgdir}" --optimize=1 + + _install_license +} + +package_antlr2-cxx() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C++ version)" + depends=('java-runtime') + + cd "$srcdir"/antlr-${pkgver}/lib/cpp + make -j1 prefix="${pkgdir}/usr" install + + _install_license +} + +package_antlr2-sharp() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C Sharp version)" + depends=('antlr2' 'mono') + + cd "$srcdir"/antlr-${pkgver}/lib/csharp + install -d "$pkgdir"/usr/share + make -j1 prefix="${pkgdir}/usr" install + + _install_license +} + +md5sums=('01cc9a2a454dd33dcd8c856ec89af090' + '78af3de823003f6d8dded39c70bc30ae' + 'e4aa827cf78f97c4e5fae086831192d6' + '158677e4c0f357afbb56656231a54815' + '0d1960d27ff81f2fea0dd35a8290216f') diff --git a/java/antlr2/gcc4.4.patch b/java/antlr2/gcc4.4.patch new file mode 100644 index 000000000..15e25fb00 --- /dev/null +++ b/java/antlr2/gcc4.4.patch @@ -0,0 +1,12 @@ +diff -Nur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp +--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp ++++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp +@@ -10,6 +10,8 @@ + + #include + ++#include ++#include + #include + + #ifdef HAS_NOT_CCTYPE_H diff --git a/java/antlr2/mono.patch b/java/antlr2/mono.patch new file mode 100644 index 000000000..59c78d811 --- /dev/null +++ b/java/antlr2/mono.patch @@ -0,0 +1,31 @@ +diff -ruN antlr-2.7.7.orig/lib/csharp/antlr.runtime.build antlr-2.7.7/lib/csharp/antlr.runtime.build +--- antlr-2.7.7.orig/lib/csharp/antlr.runtime.build 2006-11-01 16:37:17.000000000 -0500 ++++ antlr-2.7.7/lib/csharp/antlr.runtime.build 2013-05-14 20:07:32.000000000 -0400 +@@ -25,6 +25,9 @@ + + +