[SCM] libbluray/master: Use system copy of libasm4-java

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Nov 4 19:10:09 UTC 2015


The following commit has been merged in the master branch:
commit f523c362456ed7f2f57cc87e852d03e15e28c14a
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Nov 4 20:03:42 2015 +0100

    Use system copy of libasm4-java

diff --git a/debian/patches/05_use-system-asm.patch b/debian/patches/05_use-system-asm.patch
new file mode 100644
index 0000000..7d27be2
--- /dev/null
+++ b/debian/patches/05_use-system-asm.patch
@@ -0,0 +1,37 @@
+Description: Use system asm4 instead of embedded copy
+Author: Sebastian Ramacher <sramacher at debian.org>>
+Last-Update: 2015-11-04
+
+--- a/src/libbluray/bdj/build.xml
++++ b/src/libbluray/bdj/build.xml
+@@ -19,22 +19,23 @@
+ 
+     <target name="compile" depends="init"
+             description="compile the source " >
+-        <javac srcdir="${src_asm}" destdir="${build}" debug="yes"
+-               bootclasspath="${bootclasspath}"
+-               source="1.5" target="1.5">
+-               <compilerarg value="-XDignore.symbol.file"/>
+-               <compilerarg value="-Xlint:-deprecation"/>
+-        </javac>
+         <javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes"
+                bootclasspath="${bootclasspath}"
+                source="1.5" target="1.5">
+                <compilerarg value="-XDignore.symbol.file"/>
+                <compilerarg value="-Xlint:-deprecation"/>
++               <classpath>
++                   <pathelement path="/usr/share/java/asm4.jar" />
++               </classpath>
+         </javac>
+     </target>
+     <target name="dist" depends="compile"
+             description="generate the distribution" >
+-        <jar jarfile="${dist}/libbluray-${version}.jar" basedir="${build}" />
++            <jar jarfile="${dist}/libbluray-${version}.jar" basedir="${build}">
++                <manifest>
++                    <attribute name="Class-Path" value="/usr/share/java/asm4.jar" />
++                </manifest>
++        </jar>
+     </target>
+ 
+     <target name="clean"
diff --git a/debian/patches/series b/debian/patches/series
index dfdf08d..584863c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_online-image.patch
 03_split-jar-build-for-arch-all.patch
 04_kfreebsd-include.patch
+05_use-system-asm.patch

-- 
libbluray packaging



More information about the pkg-multimedia-commits mailing list