[packages/portmidi] - added format patch (fixes build with -Werror=format-security) - enhanced cmake patch by one part n
qboosh
qboosh at pld-linux.org
Sat Nov 9 08:10:01 CET 2013
commit 6d1cc934eebbc437d609d3951a8c8a591afeb7e0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Nov 9 08:10:22 2013 +0100
- added format patch (fixes build with -Werror=format-security)
- enhanced cmake patch by one part needed with current cmake
- adjusted for cmake "PLD" build type
portmidi-cmake.patch | 26 +++++++++++++++
portmidi-format.patch | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++
portmidi.spec | 4 ++-
3 files changed, 120 insertions(+), 1 deletion(-)
---
diff --git a/portmidi.spec b/portmidi.spec
index e135522..5f5a867 100644
--- a/portmidi.spec
+++ b/portmidi.spec
@@ -12,6 +12,7 @@ Source0: http://downloads.sourceforge.net/portmedia/%{version}/%{name}-src-%{ver
# Source0-md5: 03f46fd3947e2ef4c8c465baaf832241
Source1: pmdefaults.desktop
Patch0: %{name}-cmake.patch
+Patch1: %{name}-format.patch
URL: http://portmedia.sourceforge.net/
BuildRequires: alsa-lib-devel >= 0.9
BuildRequires: cmake >= 2.6
@@ -63,6 +64,7 @@ Narzędzia do konfiguracji i używania portmidi.
%prep
%setup -q -n %{name}
%patch0 -p1
+%patch1 -p1
# Add shebang, lib and class path
%{__sed} -i -e 's|^java|#!/bin/sh\njava \\\
@@ -95,7 +97,7 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_datadir}/icons/hicolor/128x128/
# Install the test applications
for app in latency midiclock midithread midithru mm qtest sysex test; do
- install build/Release/$app $RPM_BUILD_ROOT%{_libdir}/%{name}
+ install build/PLD/$app $RPM_BUILD_ROOT%{_libdir}/%{name}
done
# PLD's jni library location is different
diff --git a/portmidi-cmake.patch b/portmidi-cmake.patch
index 149de6d..06d1e11 100644
--- a/portmidi-cmake.patch
+++ b/portmidi-cmake.patch
@@ -80,3 +80,29 @@ diff -rupN portmidi.old/pm_test/CMakeLists.txt portmidi/pm_test/CMakeLists.txt
add_dependencies(${name} portmidi-static)
endmacro(make_a_test)
+--- portmidi/pm_java/CMakeLists.txt.orig 2013-11-08 22:49:02.049676834 +0100
++++ portmidi/pm_java/CMakeLists.txt 2013-11-08 22:54:44.099662483 +0100
+@@ -16,12 +16,12 @@
+ COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
+ MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
+ DEPENDS pmdefaults/PmDefaults.java
+- WORKING_DIRECTORY pm_java)
++ WORKING_DIRECTORY .)
+ add_custom_command(OUTPUT pmdefaults/PmDefaults.class
+ COMMAND javac -classpath . pmdefaults/PmDefaults.java
+ MAIN_DEPENDENCY pmdefaults/PmDefaults.java
+ DEPENDS pmdefaults/PmDefaultsFrame.java
+- WORKING_DIRECTORY pm_java)
++ WORKING_DIRECTORY .)
+ add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
+ COMMAND cp pmdefaults/portmusic_logo.png .
+ COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar
+@@ -32,7 +32,7 @@
+ COMMAND rm portmusic_logo.png
+ MAIN_DEPENDENCY pmdefaults/PmDefaults.class
+ DEPENDS ${PMDEFAULTS_ALL_CLASSES}
+- WORKING_DIRECTORY pm_java)
++ WORKING_DIRECTORY .)
+ add_custom_target(pmdefaults_target ALL
+ DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
+ # message(STATUS "add_custom_target: pmdefaults.jar")
diff --git a/portmidi-format.patch b/portmidi-format.patch
new file mode 100644
index 0000000..e21f0b1
--- /dev/null
+++ b/portmidi-format.patch
@@ -0,0 +1,91 @@
+--- portmidi/pm_test/latency.c.orig 2009-09-16 18:54:04.000000000 +0200
++++ portmidi/pm_test/latency.c 2013-11-08 22:37:43.746372124 +0100
+@@ -280,7 +280,7 @@
+ {
+ char line[STRING_MAX];
+ int n = 0, i;
+- printf(prompt);
++ fputs(prompt, stdout);
+ while (n != 1) {
+ n = scanf("%d", &i);
+ fgets(line, STRING_MAX, stdin);
+--- portmidi/pm_test/midiclock.c.orig 2009-10-04 21:50:44.000000000 +0200
++++ portmidi/pm_test/midiclock.c 2013-11-08 22:43:24.679690984 +0100
+@@ -167,7 +167,7 @@
+ {
+ char line[STRING_MAX];
+ int n = 0, i;
+- printf(prompt);
++ fputs(prompt, stdout);
+ while (n != 1) {
+ n = scanf("%d", &i);
+ fgets(line, STRING_MAX, stdin);
+@@ -256,7 +256,7 @@
+ err = Pm_OpenOutput(&midi, outp, DRIVER_INFO, OUTPUT_BUFFER_SIZE,
+ TIME_PROC, TIME_INFO, LATENCY);
+ if (err) {
+- printf(Pm_GetErrorText(err));
++ fputs(Pm_GetErrorText(err), stdout);
+ goto error_exit_no_device;
+ }
+ active = true;
+--- portmidi/pm_test/mm.c.orig 2010-10-05 20:49:09.000000000 +0200
++++ portmidi/pm_test/mm.c 2013-11-08 22:47:25.009680022 +0100
+@@ -119,7 +119,7 @@
+ {
+ char line[STRING_MAX];
+ int n = 0, i;
+- printf(prompt);
++ fputs(prompt, stdout);
+ while (n != 1) {
+ n = scanf("%d", &i);
+ fgets(line, STRING_MAX, stdin);
+@@ -136,7 +136,7 @@
+ if (!active) return;
+ while ((count = Pm_Read(midi_in, &event, 1))) {
+ if (count == 1) output(event.message);
+- else printf(Pm_GetErrorText(count));
++ else fputs(Pm_GetErrorText(count), stdout);
+ }
+ }
+
+@@ -168,7 +168,7 @@
+ inp = get_number("Type input device number: ");
+ err = Pm_OpenInput(&midi_in, inp, NULL, 512, NULL, NULL);
+ if (err) {
+- printf(Pm_GetErrorText(err));
++ fputs(Pm_GetErrorText(err), stdout);
+ Pt_Stop();
+ mmexit(1);
+ }
+@@ -484,7 +484,7 @@
+ "gs", "a", "bf", "b" };
+ /* note octave correction below */
+ sprintf(result, "%s%d", ptos[p % 12], (p / 12) - 1);
+- printf(result);
++ fputs(result, stdout);
+ return strlen(result);
+ }
+
+--- portmidi/pm_test/sysex.c.orig 2010-09-20 21:57:48.000000000 +0200
++++ portmidi/pm_test/sysex.c 2013-11-08 22:48:00.546346082 +0100
+@@ -39,7 +39,7 @@
+ {
+ char line[STRING_MAX];
+ int n = 0, i;
+- printf(prompt);
++ fputs(prompt, stdout);
+ while (n != 1) {
+ n = scanf("%d", &i);
+ fgets(line, STRING_MAX, stdin);
+--- portmidi/pm_test/test.c.orig 2009-09-16 18:54:04.000000000 +0200
++++ portmidi/pm_test/test.c 2013-11-08 22:48:28.869678279 +0100
+@@ -37,7 +37,7 @@
+ {
+ char line[STRING_MAX];
+ int n = 0, i;
+- printf(prompt);
++ fputs(prompt, stdout);
+ while (n != 1) {
+ n = scanf("%d", &i);
+ fgets(line, STRING_MAX, stdin);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/portmidi.git/commitdiff/6d1cc934eebbc437d609d3951a8c8a591afeb7e0
More information about the pld-cvs-commit
mailing list