* [gentoo-commits] repo/gentoo:master commit in: dev-java/fec/, dev-java/fec/files/
@ 2015-10-18 16:37 Patrice Clement
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2015-10-18 16:37 UTC (permalink / raw
To: gentoo-commits
commit: e2f2848d96675369f493348b9262d209796984ae
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 16:23:18 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 16:35:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f2848d
dev-java/fec: Remove dev-java/concurrent-util dependency. Fixes bug 546500.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/fec/Manifest | 1 +
dev-java/fec/fec-1.0.4-r2.ebuild | 67 ++++++++++++++
dev-java/fec/files/fec-1.0.4-build.patch | 10 +-
dev-java/fec/files/fec-1.0.4-libfec8path.patch | 13 +--
.../fec-1.0.4-remove-concurrent-util-imports.patch | 101 +++++++++++++++++++++
5 files changed, 180 insertions(+), 12 deletions(-)
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index d85a1e3..d77a48e 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -1 +1,2 @@
DIST fec-1.0.4.tar.bz2 611131 SHA256 978d0ef609ec334ea85e3f70e46a94f6c2cc04393b590a2addfc74e03634b8dd SHA512 45e33fc4b71fcd78a7c5310f2b58df8b83a988500d0de7efebbeade712f5c93d57bbe63fd7dc148ccb1cc6418fc9c79e27be6fe0512e2294c289b192c01ab871 WHIRLPOOL cef5de5b24ddc33f6a85581cd149d3c5887f8f49843df5918158d137b263a58b888149fe68e293bc697db0b7b74e3952fabc1842f8b8f80932de379f2c7bf0d2
+DIST fec-1.0.4.tar.gz 449406 SHA256 b33f5558f53e1abd9a4e58b5898cd605607698f22679f577f5fdf6cb1a2dd48a SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343 WHIRLPOOL 3179b18a341b65b6cd295cf5f716887f8c90f03f81017444468dd57220afa4c4e58c5112fd4ef898d4f7fd7a307eb5846ffed6bead8d13fedfc30dc41fbb23d5
diff --git a/dev-java/fec/fec-1.0.4-r2.ebuild b/dev-java/fec/fec-1.0.4-r2.ebuild
new file mode 100644
index 0000000..f589f89
--- /dev/null
+++ b/dev-java/fec/fec-1.0.4-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
+
+DESCRIPTION="Forward Error Correction library in Java"
+HOMEPAGE="https://bitbucket.org/onionnetworks/"
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/log4j:0"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/"${P}-libfec8path.patch"
+ "${FILESDIR}"/"${P}-build.patch"
+ "${FILESDIR}"/"${P}-soname.patch"
+ "${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="log4j"
+EANT_BUILD_TARGET="jars"
+
+# There seems to be unit tests, but they are in such a state.
+RESTRICT="test"
+
+java_prepare() {
+ # In fact, we'll wipe tests altogether.
+ rm -rf tests || die
+
+ # Apply patches.
+ epatch "${PATCHES[@]}"
+
+ # Get rid of bundled jars.
+ java-pkg_clean
+}
+
+src_compile() {
+ java-pkg-2_src_compile
+ einfo "Sucessfully compiled Java classes!"
+
+ cd "${S}"/src/csrc || die
+ append-flags -fPIC
+ emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die
+ einfo "Sucessfully compiled C files!"
+}
+
+src_install() {
+ java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
+ use doc && java-pkg_dojavadoc javadoc
+ use source && java-pkg_dosrc src/com
+ dolib.so src/csrc/libfec{8,16}.so || die
+}
diff --git a/dev-java/fec/files/fec-1.0.4-build.patch b/dev-java/fec/files/fec-1.0.4-build.patch
index 3920dce..c47eb54 100644
--- a/dev-java/fec/files/fec-1.0.4-build.patch
+++ b/dev-java/fec/files/fec-1.0.4-build.patch
@@ -1,8 +1,6 @@
-Index: csrc/Makefile
-===================================================================
---- src/csrc.orig/Makefile
-+++ src/csrc/Makefile
-@@ -28,11 +28,8 @@ fec8-jinterf.o: fec-jinterf.c
+--- src/csrc/Makefile.orig 2015-10-18 14:31:56.752486000 +0000
++++ src/csrc/Makefile 2015-10-18 14:33:11.502486000 +0000
+@@ -28,11 +28,8 @@
-I$(JAVA_HOME)/include/linux fec-jinterf.c \
-o fec8-jinterf.o
@@ -16,7 +14,7 @@ Index: csrc/Makefile
libfec16.so: fec16.o fec16-jinterf.o
$(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so
-@@ -42,11 +39,8 @@ fec16-jinterf.o: fec-jinterf.c
+@@ -42,11 +39,8 @@
-I$(JAVA_HOME)/include/linux fec-jinterf.c \
-o fec16-jinterf.o
diff --git a/dev-java/fec/files/fec-1.0.4-libfec8path.patch b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
index 503db7c..58eb89e 100644
--- a/dev-java/fec/files/fec-1.0.4-libfec8path.patch
+++ b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
@@ -1,5 +1,5 @@
---- src/com/onionnetworks/fec/Native8Code.java 2009-08-21 02:37:00.515004583 +0200
-+++ src/com/onionnetworks/fec/Native8Code.java.new 2009-08-21 02:37:57.829254678 +0200
+--- src/com/onionnetworks/fec/Native8Code.java.orig 2015-10-18 14:27:06.160486000 +0000
++++ src/com/onionnetworks/fec/Native8Code.java 2015-10-18 14:30:32.557486000 +0000
@@ -3,6 +3,7 @@
//import java.security.AccessController;
//import sun.security.action.*;
@@ -16,14 +16,15 @@
- (Native8Code.class.getClassLoader(),"fec8");
- if (path != null) {
- System.load(path);
-+ File path = new File("/usr/lib/libfec8.so");
-+ System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
-+ System.load(path.getAbsolutePath());
- initFEC();
+- initFEC();
- } else {
- System.out.println("Unable to find native library for fec8 for platform "+NativeDeployer.OS_ARCH);
- System.out.println(path);
- }
++ File path = new File("/usr/lib/libfec8.so");
++ System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
++ System.load(path.getAbsolutePath());
++ initFEC();
}
public Native8Code(int k, int n) {
diff --git a/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch b/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch
new file mode 100644
index 0000000..87a9473
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch
@@ -0,0 +1,101 @@
+--- src/com/onionnetworks/fec/io/FECFile.java.orig 2015-10-18 15:38:26.000000000 +0000
++++ src/com/onionnetworks/fec/io/FECFile.java 2015-10-18 16:06:51.159486000 +0000
+@@ -10,7 +10,9 @@
+ import com.onionnetworks.fec.FECCodeFactory;
+ import com.onionnetworks.io.RAF;
+ import com.onionnetworks.util.*;
+-import EDU.oswego.cs.dl.util.concurrent.*;
++
++import java.util.concurrent.locks.ReadWriteLock;
++import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+ /**
+ * This class provides the necessary file IO routines to go along with the raw
+@@ -129,9 +131,9 @@
+ this.raf = new RAF(f,mode); // synched RandomAccessFile
+
+ // Create the locks.
+- locks = new ReadWriteLock[blockCount];
++ locks = new ReentrantReadWriteLock[blockCount];
+ for (int i=0;i<locks.length;i++) {
+- locks[i] = new ReentrantWriterPreferenceReadWriteLock();
++ locks[i] = new ReentrantReadWriteLock();
+ }
+
+ // add the default exception handler.
+@@ -258,7 +260,7 @@
+ byte[] b = null;
+
+ try {
+- locks[blockNum].readLock().acquire();
++ locks[blockNum].readLock().lock();
+ try {
+
+ // This raf check then pp access is safe because all
+@@ -296,9 +298,9 @@
+ return;
+ }
+ } finally {
+- locks[blockNum].readLock().release();
++ locks[blockNum].readLock().unlock();
+ }
+- } catch (InterruptedException e) {
++ } catch (Exception e) {
+ throw new InterruptedIOException(e.toString());
+ }
+
+@@ -342,13 +344,13 @@
+
+ int result = -1;
+ try {
+- locks[blockNum].writeLock().acquire();
++ locks[blockNum].writeLock().lock();
+ try {
+ result = write0(pkt,blockNum,stripeNum);
+ } finally {
+- locks[blockNum].writeLock().release();
++ locks[blockNum].writeLock().unlock();
+ }
+- } catch (InterruptedException e) {
++ } catch (Exception e) {
+ throw new InterruptedIOException(e.toString());
+ }
+
+@@ -444,16 +446,16 @@
+ }
+
+ try {
+- locks[blockNum].writeLock().acquire();
++ locks[blockNum].writeLock().lock();
+ try {
+ // seek and write the decoded block.
+ raf.seekAndWrite(blockNum*blockSize,b,0,b.length);
+ // Update the placement to show decoded entries.
+ pp.setBlockDecoded(blockNum);
+ } finally {
+- locks[blockNum].writeLock().release();
++ locks[blockNum].writeLock().unlock();
+ }
+- } catch (InterruptedException e) {
++ } catch (Exception e) {
+ throw new InterruptedIOException(e.toString());
+ }
+
+@@ -468,7 +470,7 @@
+ */
+ public void acquireAllWriteLocks() throws InterruptedException {
+ for (int i=0;i<locks.length;i++) {
+- locks[i].writeLock().acquire();
++ locks[i].writeLock().lock();
+ }
+ }
+
+@@ -479,7 +481,7 @@
+ */
+ public void releaseAllWriteLocks() throws InterruptedException {
+ for (int i=0;i<locks.length;i++) {
+- locks[i].writeLock().release();
++ locks[i].writeLock().unlock();
+ }
+ }
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/fec/, dev-java/fec/files/
@ 2015-11-01 19:12 Patrice Clement
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2015-11-01 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 9c73bdbf43377cbba6e16a0af4636cce108210c6
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 1 15:16:56 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Nov 1 19:09:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c73bdbf
dev-java/fec: Clean up old.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/fec/Manifest | 1 -
dev-java/fec/fec-1.0.4-r1.ebuild | 61 ------------------------------------
dev-java/fec/files/libfec8path.patch | 27 ----------------
3 files changed, 89 deletions(-)
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index d77a48e..feba17b 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -1,2 +1 @@
-DIST fec-1.0.4.tar.bz2 611131 SHA256 978d0ef609ec334ea85e3f70e46a94f6c2cc04393b590a2addfc74e03634b8dd SHA512 45e33fc4b71fcd78a7c5310f2b58df8b83a988500d0de7efebbeade712f5c93d57bbe63fd7dc148ccb1cc6418fc9c79e27be6fe0512e2294c289b192c01ab871 WHIRLPOOL cef5de5b24ddc33f6a85581cd149d3c5887f8f49843df5918158d137b263a58b888149fe68e293bc697db0b7b74e3952fabc1842f8b8f80932de379f2c7bf0d2
DIST fec-1.0.4.tar.gz 449406 SHA256 b33f5558f53e1abd9a4e58b5898cd605607698f22679f577f5fdf6cb1a2dd48a SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343 WHIRLPOOL 3179b18a341b65b6cd295cf5f716887f8c90f03f81017444468dd57220afa4c4e58c5112fd4ef898d4f7fd7a307eb5846ffed6bead8d13fedfc30dc41fbb23d5
diff --git a/dev-java/fec/fec-1.0.4-r1.ebuild b/dev-java/fec/fec-1.0.4-r1.ebuild
deleted file mode 100644
index 089e66f..0000000
--- a/dev-java/fec/fec-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="Forword error correction libs"
-HOMEPAGE="http://www.onionnetworks.com/developers/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="dev-java/log4j
- dev-java/concurrent-util"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEPEND}"
-EANT_BUILD_TARGET="jars"
-
-src_unpack() {
- unpack ${A}
- cd "${S}" || die
- sed -i -e 's/build.compiler=jikes/#build.compiler=jikes/g' build.properties || die
- sed -i -e 's/test.lib/lib/g' build.properties || die
- epatch "${FILESDIR}"/${P}-{libfec8path,build,soname}.patch
-
- eant clean
- cd lib || die
- rm -v *.jar || die
- java-pkg_jar-from log4j
- java-pkg_jar-from concurrent-util concurrent.jar concurrent-jaxed.jar
- cd "${S}" || die
- unzip -q common-20020926.zip || die
- cd common-20020926 || die
- eant clean
- cp -r src/com ../src/ || die
-}
-
-src_compile() {
- java-pkg-2_src_compile
- cd "${S}"/src/csrc
- append-flags -fPIC
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die
-}
-
-#there seem to be unit tests, but they are in such a state.
-
-src_install() {
- java-pkg_newjar lib/onion-${PN}.jar ${PN}.jar
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc src/com
- dolib.so src/csrc/libfec{8,16}.so || die
-}
diff --git a/dev-java/fec/files/libfec8path.patch b/dev-java/fec/files/libfec8path.patch
deleted file mode 100644
index 928e3fe..0000000
--- a/dev-java/fec/files/libfec8path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/com/onionnetworks/fec/Native8Code.java 2002-09-30 20:19:24.000000000 +0200
-+++ src/com/onionnetworks/fec/Native8Code.java.new 2008-03-24 01:38:35.000000000 +0100
-@@ -3,6 +3,7 @@
- //import java.security.AccessController;
- //import sun.security.action.*;
- import com.onionnetworks.util.*;
-+import java.io.File;
-
- /**
- * This class is the frontend for the JNI wrapper for the C implementation of
-@@ -21,13 +22,9 @@
- private int code;
-
- static {
-- String path = NativeDeployer.getLibraryPath
-- (Native8Code.class.getClassLoader(),"fec8");
-- if (path != null) {
-- System.load(path);
-- } else {
-- System.out.println("Unable to find native library for fec8");
-- }
-+ File path = new File("/usr/lib/libfec8.so");
-+ System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
-+ System.load(path.getAbsolutePath());
- }
-
- public Native8Code(int k, int n) {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-01 19:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-01 19:12 [gentoo-commits] repo/gentoo:master commit in: dev-java/fec/, dev-java/fec/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2015-10-18 16:37 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox