[Git][java-team/libtritonus-java][master] 2 commits: Import Debian changes 20070428-14.1
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Sun Apr 7 17:59:34 BST 2024
Tony Mancill pushed to branch master at Debian Java Maintainers / libtritonus-java
Commits:
f13d6115 by Sebastian Ramacher at 2024-04-07T09:59:31-07:00
Import Debian changes 20070428-14.1
libtritonus-java (20070428-14.1) unstable; urgency=medium
.
* Non-maintainer upload.
.
[ Peter Michael Green ]
* Bump java source/binary versions to 1.6, since unstable's compiler
no longer accepts 1.5
* Fix build with new fluidsynth. (Closes: #946916)
* Bump fluidsynth build-dependency.
- - - - -
347c3632 by Andrey Rakhmatullin at 2024-04-07T09:59:35-07:00
Import Debian changes 20070428-14.2
libtritonus-java (20070428-14.2) unstable; urgency=medium
.
* Non-maintainer upload.
* Fix FTBFS with -Werror=implicit-function-declaration (Closes: #1066649).
- - - - -
7 changed files:
- debian/ant.properties
- debian/changelog
- debian/control
- + debian/patches/bump-java-to-1.6.patch
- + debian/patches/fix-implicit-function-declaration.patch
- + debian/patches/fluidsynth2.patch
- debian/patches/series
Changes:
=====================================
debian/ant.properties
=====================================
@@ -1,2 +1,2 @@
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
+ant.build.javac.source=1.6
+ant.build.javac.target=1.6
=====================================
debian/changelog
=====================================
@@ -1,3 +1,22 @@
+libtritonus-java (20070428-14.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with -Werror=implicit-function-declaration (Closes: #1066649).
+
+ -- Andrey Rakhmatullin <wrar at debian.org> Fri, 29 Mar 2024 00:44:52 +0500
+
+libtritonus-java (20070428-14.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Peter Michael Green ]
+ * Bump java source/binary versions to 1.6, since unstable's compiler
+ no longer accepts 1.5
+ * Fix build with new fluidsynth. (Closes: #946916)
+ * Bump fluidsynth build-dependency.
+
+ -- Sebastian Ramacher <sramacher at debian.org> Mon, 27 Jan 2020 00:28:23 +0100
+
libtritonus-java (20070428-14) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends:
default-jdk,
libasound2-dev | libasound-dev,
libcdparanoia-dev,
- libfluidsynth-dev,
+ libfluidsynth-dev (>= 2),
libjlayer-java,
libjorbis-java,
libogg-dev,
=====================================
debian/patches/bump-java-to-1.6.patch
=====================================
@@ -0,0 +1,54 @@
+Description: Bump java source/binary versions to 1.6, since unstable's compiler no longer accepts 1.5
+ Note: the java version is also mentioned in debian/ant.properties, I don't know
+ which one takes precedence.
+Author: Peter Michael Green <plugwash at debian.org>
+
+--- libtritonus-java-20070428.orig/build-common.xml
++++ libtritonus-java-20070428/build-common.xml
+@@ -15,7 +15,7 @@
+ <property name="src.classes" value="${src}/classes" />
+ <property name="src.misc" value="${src}/misc" />
+ <property name="debug" value="on"/>
+- <property name="source" value="1.5"/>
++ <property name="source" value="1.6"/>
+ <available
+ classname="grame.midishare.Midi"
+ property="midishare-present" />
+@@ -404,7 +404,7 @@
+ Windowtitle="Tritonus API"
+ link="http://java.sun.com/j2se/1.5.0/docs/api/"
+ use="true"
+- source="1.5"
++ source="1.6"
+ additionalparam="-breakiterator">
+ </javadoc>
+ <!-- additionalparam="-breakiterator" -->
+@@ -416,7 +416,7 @@
+ package="true" sourcepath="${src}" destdir="${javadoc.dir}"
+ packagenames="javax.sound.*"
+ Windowtitle="Java Sound API"
+- source="1.5"
++ source="1.6"
+ additionalparam="-breakiterator">
+ </javadoc>
+ <!-- additionalparam="-breakiterator" -->
+--- libtritonus-java-20070428.orig/test/suite/build.xml
++++ libtritonus-java-20070428/test/suite/build.xml
+@@ -45,7 +45,7 @@
+ <target name="compile-api" depends="prepare">
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+- source="1.5"
++ source="1.6"
+ debug="on">
+ <compilerarg value="-Xlint:unchecked"/>
+ <exclude name="org/tritonus/test/*.java"/>
+@@ -59,7 +59,7 @@
+ <target name="compile-tritonus" depends="prepare, init-tritonus">
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+- source="1.5"
++ source="1.6"
+ debug="on">
+ <exclude name="org/tritonus/test/api/"/>
+ <classpath refid="compile.classpath"/>
=====================================
debian/patches/fix-implicit-function-declaration.patch
=====================================
@@ -0,0 +1,29 @@
+Description: Add missing header includes.
+Author: Andrey Rakhmatullin <wrar at debian.org>
+Bug-Debian: https://bugs.debian.org/1066649
+Last-Update: 2024-03-28
+
+Index: libtritonus-java-20070428/src/lib/pvorbis/org_tritonus_lowlevel_pogg_Buffer.c
+===================================================================
+--- libtritonus-java-20070428.orig/src/lib/pvorbis/org_tritonus_lowlevel_pogg_Buffer.c
++++ libtritonus-java-20070428/src/lib/pvorbis/org_tritonus_lowlevel_pogg_Buffer.c
+@@ -24,6 +24,7 @@
+ |<--- this code is formatted to fit into 80 columns --->|
+ */
+
++#include <string.h>
+ #include "common.h"
+ #include "org_tritonus_lowlevel_pogg_Buffer.h"
+
+Index: libtritonus-java-20070428/src/lib/pvorbis/org_tritonus_lowlevel_pogg_Packet.c
+===================================================================
+--- libtritonus-java-20070428.orig/src/lib/pvorbis/org_tritonus_lowlevel_pogg_Packet.c
++++ libtritonus-java-20070428/src/lib/pvorbis/org_tritonus_lowlevel_pogg_Packet.c
+@@ -24,6 +24,7 @@
+ |<--- this code is formatted to fit into 80 columns --->|
+ */
+
++#include <string.h>
+ #include "common.h"
+ #include "org_tritonus_lowlevel_pogg_Packet.h"
+
=====================================
debian/patches/fluidsynth2.patch
=====================================
@@ -0,0 +1,54 @@
+Description: Fix build with new fluidsynth.
+Author: Peter Michael Green <plugwash at debian.org>
+
+--- libtritonus-java-20070428.orig/src/lib/fluidsynth/org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c
++++ libtritonus-java-20070428/src/lib/fluidsynth/org_tritonus_midi_device_fluidsynth_FluidSynthesizer.c
+@@ -282,7 +282,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_
+ jobject instrument;
+
+ fluid_sfont_t* sfont;
+- fluid_preset_t preset;
++ fluid_preset_t* preset;
+ int offset;
+ int i = 0;
+ fluid_synth_t* synth;
+@@ -313,9 +313,9 @@ JNIEXPORT jobjectArray JNICALL Java_org_
+
+ if (sfont != NULL)
+ {
+- sfont->iteration_start(sfont);
++ fluid_sfont_iteration_start(sfont);
+
+- while (sfont->iteration_next(sfont, &preset))
++ while ((preset = fluid_sfont_iteration_next(sfont)))
+ {
+ count++;
+ }
+@@ -330,19 +330,19 @@ JNIEXPORT jobjectArray JNICALL Java_org_
+ if (sfont == NULL)
+ return 0;
+
+- sfont->iteration_start(sfont);
++ fluid_sfont_iteration_start(sfont);
+
+- while (sfont->iteration_next(sfont, &preset))
++ while ((preset = fluid_sfont_iteration_next(sfont)))
+ {
+ instrname = (*env)->NewStringUTF(env,
+- // fluid_preset_get_name(&preset)
+- preset.get_name(&preset)
++ fluid_preset_get_name(preset)
++ // preset.get_name(&preset)
+ );
+ instrument = (*env)->NewObject(env, fluidinstrclass, initid, obj,
+- // (jint) fluid_preset_get_banknum(&preset) + offset,
+- (jint) (preset.get_banknum(&preset) + offset),
+- // (jint) fluid_preset_get_num(&preset),
+- (jint) (preset.get_num(&preset)),
++ (jint) fluid_preset_get_banknum(preset) + offset,
++ // (jint) (preset.get_banknum(&preset) + offset),
++ (jint) fluid_preset_get_num(preset),
++ // (jint) (preset.get_num(&preset)),
+ (jobject) instrname);
+ (*env)->SetObjectArrayElement(env, instruments, i++, instrument);
+ }
=====================================
debian/patches/series
=====================================
@@ -7,3 +7,6 @@ dfsg.diff
alsa-1.0.16.diff
ignore-ant-dtd.diff
java10-compatibility.diff
+bump-java-to-1.6.patch
+fluidsynth2.patch
+fix-implicit-function-declaration.patch
View it on GitLab: https://salsa.debian.org/java-team/libtritonus-java/-/compare/d3384bec65ab10cd85b0faa639135d1b93cae646...347c36322c1b9ae748ea1264d22d6c26d83ba8dd
--
View it on GitLab: https://salsa.debian.org/java-team/libtritonus-java/-/compare/d3384bec65ab10cd85b0faa639135d1b93cae646...347c36322c1b9ae748ea1264d22d6c26d83ba8dd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240407/98280381/attachment.htm>
More information about the pkg-java-commits
mailing list