Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre

6 files changed, 182 insertions, 5 deletions

diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index b7d5cd9cd..9014131c0 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=luxrender
 _pkgver=1.5.0
 _pkgverM=${_pkgver%.*}
 _bldname=blender
-_bldver=2.75
+_bldver=2.76
 _bldep=17
 _srcname=${_pkgname::3}${_bldname::5}25
 _srcver=63e44ef60fb4
@@ -12,15 +12,16 @@ _srcver=63e44ef60fb4
 pkgname=$_bldname-addon-$_pkgname
 if [[ ${_pkgver/*./} == 0 ]]; then
   pkgver=${_pkgver/.*/}.${_pkgverM#*.}.v$_bldver
+  provides=("$_srcname=${_pkgver/.*/}.${_pkgverM#*.}")
 else
   pkgver=$_pkgver.v$_bldver
+  provides=("$_srcname=$_pkgver")
 fi
 pkgrel=1
 pkgdesc="$_srcname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname package)"
 arch=('any')
 url="http://www.$_pkgname.net/"
 license=('GPL2')
-provides=("$_srcname=$_pkgver")
 conflicts=("$_srcname")
 replaces=("$_srcname")
 if [[ ${_pkgver/*./} == 0 ]]; then
@@ -43,7 +44,9 @@ prepare() {
 }
 
 package() {
-  depends=("$_pkgname>=${_pkgver/.*/}.${_pkgverM#*.}" "$_pkgname<${_pkgver/.*/}.$((${_pkgverM#*.}+1))" "$_bldname>=$_bldep:$_bldver" "$_bldname<$_bldep:${_bldver/.*/}.$((${_bldver/*./}+1))")
+  _relver="${_bldver%%[.r][a-z]*}"
+  _minver="${_relver#*.}"
+  depends=("$_bldname>=$_bldep:${_bldver%%[.r][a-z]*}rc1" "$_bldname<$_bldep:${_bldver%%[.r]*}.$(($_minver+1))rc1" "$_pkgname")
 
   a=$srcdir/$_pkgname-$_srcname-$_srcver/src/$_pkgname
   b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
diff --git a/libre/gst-plugins-bad/PKGBUILD b/libre/gst-plugins-bad/PKGBUILD
index aa1e7c7c3..bd233a4af 100644
--- a/libre/gst-plugins-bad/PKGBUILD
+++ b/libre/gst-plugins-bad/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gst-plugins-bad
 pkgver=1.6.2
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -29,11 +29,14 @@ prepare() {
 build() {
   cd $pkgname-$pkgver
 
+  # disable GL and GLX on armv7h
+  [[ "$CARCH" = "armv7h" ]] && extra="--disable-gl --disable-glx --enable-gles2"
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental --enable-gtk-doc \
     --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \
     --with-package-origin="https://www.parabola.nu/" \
-    --with-gtk=3.0
+    --with-gtk=3.0 $extra
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/libre/java-avalon-framework/PKGBUILD b/libre/java-avalon-framework/PKGBUILD
new file mode 100644
index 000000000..60c30d955
--- /dev/null
+++ b/libre/java-avalon-framework/PKGBUILD
@@ -0,0 +1,72 @@
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+_libname=avalon-framework
+pkgname=java-${_libname}
+pkgver=4.2.0
+pkgrel=6.parabola1
+pkgdesc="Reusable components for J2SE applications."
+arch=('any')
+url="http://excalibur.apache.org/"
+license=('APACHE')
+depends=('java-runtime')
+makedepends=('java-environment' 'java-avalon-logkit' 'jh' 'log4j-1.2')
+source=("https://archive.apache.org/dist/excalibur/${_libname}/source/${_libname}-${pkgver}-src.tar.gz"
+        "https://repo.maven.apache.org/maven2/${_libname}/${_libname}-api/${pkgver}/${_libname}-api-${pkgver}.pom"
+        "https://repo.maven.apache.org/maven2/${_libname}/${_libname}-impl/${pkgver}/${_libname}-impl-${pkgver}.pom"
+        'avalon-framework-rename_enum.patch')
+md5sums=('fd42e4ed9d9cd7a4d2e7fca7ab8e847f'
+         '7dd8406e2fda8ec924f094761b4695de'
+         '1ae6d40afceecb706838ca4eb3157776'
+         '577de617b81a6d73f2f19c543af99922')
+
+prepare() {
+  cd "${srcdir}/${_libname}"
+  patch -Np1 -i "${srcdir}/avalon-framework-rename_enum.patch"
+  mkdir -p build/classes
+  mkdir -p build/classes/{api,impl,all}
+}
+
+build() {
+  cd "${srcdir}/${_libname}"
+
+  CLASSPATH="/usr/share/java/avalon-logkit.jar:/usr/share/java/log4j-1.2.jar"
+
+  javac -cp $CLASSPATH -d "build/classes/api" \
+    $(find "api/src/java" -name \*.java)
+  javac -cp "$CLASSPATH:build/classes/api" -d "build/classes/impl" \
+    $(find "impl/src/java" -name \*.java)
+  javac -cp $CLASSPATH -d "build/classes/all" \
+    $(find "api/src/java" "impl/src/java" -name \*.java)
+
+  javadoc -classpath $CLASSPATH -d "build/javadoc" \
+    -sourcepath "api/src/java" -subpackages org
+
+  jar -cvf "${_libname}-api.jar" -C "build/classes/api" .
+  jar -cvf "${_libname}-impl.jar" -C "build/classes/impl" .
+  jar -cvf "${_libname}.jar" -C "build/classes/all" .
+}
+
+package() {
+  cd "${srcdir}/${_libname}"
+
+  # Install license file
+  install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+
+  # Install documentation
+  install -d "${pkgdir}/usr/share/doc/${pkgname}"
+  cp -r "build/javadoc" "${pkgdir}/usr/share/doc/${pkgname}"
+
+  # Install Maven artifacts
+  artifacts=("${_libname}-api" "${_libname}-impl")
+  export DESTDIR=${pkgdir}
+  for artifact in "${artifacts[@]}"; do
+    jh mvn-install ${_libname} ${artifact} ${pkgver} \
+      "${srcdir}/${artifact}-${pkgver}.pom" \
+      "${artifact}.jar" \
+      "${artifact}-${pkgver}.jar"
+    ln -s "/usr/share/java/${artifact}-${pkgver}.jar" \
+      "${pkgdir}/usr/share/java/${artifact}.jar"
+  done
+
+  install -Dm644 "${_libname}.jar" "${pkgdir}/usr/share/java/${_libname}/${_libname}.jar"
+}
diff --git a/libre/java-avalon-framework/avalon-framework-rename_enum.patch b/libre/java-avalon-framework/avalon-framework-rename_enum.patch
new file mode 100644
index 000000000..85ee8fd6a
--- /dev/null
+++ b/libre/java-avalon-framework/avalon-framework-rename_enum.patch
@@ -0,0 +1,17 @@
+--- avalon-framework.orig/api/src/java/org/apache/avalon/framework/Enum.java	2004-05-15 19:09:06.000000000 -0500
++++ avalon-framework/api/src/java/org/apache/avalon/framework/Enum.java	2015-09-19 02:49:20.766734911 -0500
+@@ -126,11 +126,11 @@
+         if( !(o instanceof Enum) )

+             return false;

+ 

+-        final Enum enum = (Enum)o;

++        final Enum elements = (Enum)o;

+ 

+-        if( !getClass().equals( enum.getClass() ) )

++        if( !getClass().equals( elements.getClass() ) )

+             return false;

+-        if( m_name != null ? !m_name.equals( enum.m_name ) : enum.m_name != null )

++        if( m_name != null ? !m_name.equals( elements.m_name ) : elements.m_name != null )

+             return false;

+ 

+         return true;

diff --git a/libre/java-batik/PKGBUILD b/libre/java-batik/PKGBUILD
new file mode 100644
index 000000000..1ff561bb3
--- /dev/null
+++ b/libre/java-batik/PKGBUILD
@@ -0,0 +1,69 @@
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+pkgname=java-batik
+pkgver=1.8
+pkgrel=2.parabola1
+pkgdesc='SVG library for Java.'
+arch=('any')
+url='http://xmlgraphics.apache.org/batik/'
+license=(APACHE)
+depends=('java-runtime' 'java-commons-io' 'java-commons-logging' 'java-xmlgraphics-commons'
+         'java-xml-commons-external' 'rhino' 'xalan-java' 'xerces2-java')
+makedepends=('java-environment' 'apache-ant' 'unzip' 'jh')
+source=("https://www.apache.org/dist/xmlgraphics/batik/source/batik-src-${pkgver}.tar.gz"{,.asc}
+        'batik-remove_js.patch')
+md5sums=('2d330fce73c15629b9052a1a52d4af24'
+         'SKIP'
+         '71705a32991629bf5f8ee35c91c88dca')
+validpgpkeys=('9D5F9D9B3E21B585E8F4551082036989D56B5F17') # Luis Bernardo
+
+prepare() {
+	cd "${srcdir}/batik-${pkgver}"
+	rm -rv lib/*
+	rm -rv test-resources/org/apache/batik/bridge/*.jar
+	rm -rv documentation-sources/content/demo/*.jar
+	ln -sf /usr/share/java/xml-apis.jar lib/xml-apis.jar
+	ln -sf /usr/share/java/xml-apis-ext.jar lib/xml-apis-ext.jar
+	#ln -sf /usr/share/java/xalan.jar lib/xalan.jar
+	#ln -sf /usr/share/java/xercesImpl.jar lib/xercesImpl.jar
+	ln -sf /usr/share/java/xmlgraphics-commons.jar lib/xmlgraphics-commons.jar
+
+	patch -Np1 -i ../batik-remove_js.patch
+}
+
+build() {
+	cd "${srcdir}/batik-${pkgver}"
+	ant all-jar libs-jar ext-jar transcoder-jar maven-artifacts
+}
+
+package() {
+	cd "${srcdir}/batik-${pkgver}/batik-${pkgver}"
+
+	# Install license file
+	install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+	# Install Maven artifacts
+	install -d "${pkgdir}/usr/share/java/batik"
+	export DESTDIR=${pkgdir}
+	for artifact in $(find . -name "*.pom" | sed 's/.*\///' | sed 's/-[0-9.]*\.pom$//'); do
+	  jh mvn-install "org.apache.xmlgraphics" ${artifact} ${pkgver} \
+	    "maven/${artifact}/${pkgver}/${artifact}-${pkgver}.pom" \
+	    "maven/${artifact}/${pkgver}/${artifact}-${pkgver}.jar" \
+	    "${artifact}.jar"
+
+	  # Symlink them to /usr/share/java
+	  ln -s "/usr/share/java/${artifact}.jar" \
+	    "${pkgdir}/usr/share/java/${artifact}-${pkgver}.jar"
+	done
+
+	# Install batik-all.jar and batik-libs.jar
+	install -m644 "lib/batik-all-${pkgver}.jar" \
+	  "${pkgdir}/usr/share/java/batik/"
+	install -m644 "lib/batik-libs-${pkgver}.jar" \
+	  "${pkgdir}/usr/share/java/batik/"
+
+	ln -s "/usr/share/java/batik/batik-all-${pkgver}.jar" \
+	  "${pkgdir}/usr/share/java/batik/batik-all.jar"
+	ln -s "/usr/share/java/batik/batik-libs-${pkgver}.jar" \
+	  "${pkgdir}/usr/share/java/batik/batik-libs.jar"
+}
diff --git a/libre/java-batik/batik-remove_js.patch b/libre/java-batik/batik-remove_js.patch
new file mode 100644
index 000000000..6b2afe6db
--- /dev/null
+++ b/libre/java-batik/batik-remove_js.patch
@@ -0,0 +1,13 @@
+--- batik-1.8.orig/build.xml	2015-03-10 04:58:29.000000000 -0500
++++ batik-1.8/build.xml	2015-12-18 01:05:55.701905436 -0500
+@@ -720,10 +720,6 @@
+     <copy file="${src}/${project}-xml.pom.template" tofile="${maven}/${project}-xml/${completeVersion}/${project}-xml-${completeVersion}.pom" filtering="true"/>
+     <copy file="${build}/lib/${project}-xml-${completeVersion}.jar" tofile="${maven}/${project}-xml/${completeVersion}/${project}-xml-${completeVersion}.jar"/>
+ 
+-    <mkdir dir="${maven}/${project}-js/${completeVersion}"/>
+-    <copy file="${src}/${project}-js.pom.template" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.pom" filtering="true"/>
+-    <copy file="${build}/lib/js.jar" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.jar"/>
+-
+     <!-- Generate checksums of all artifacts and POMs -->
+     <checksum algorithm="MD5" fileext=".md5">
+       <fileset dir="${maven}">