[packages/sc68] - new - info patch to unify direntry and fix texinfo error - system-unice68 patch to use already ins

qboosh qboosh at pld-linux.org
Sat Jun 24 10:33:10 CEST 2023 

commit 9dd50beb3b50a6392cc34a0e12776e8caf4fbdc5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 24 09:23:19 2023 +0200

    - new
    - info patch to unify direntry and fix texinfo error
    - system-unice68 patch to use already installed unice68 library
    - link patch to fix inter-library linking
    - format patch to fix build with -Werror=format-security
    - opt patch not to override our optflags
    - devel patch to fix bashism and remove optflags from pkg-config/sc68-config output

 sc68-devel.patch          | 41 ++++++++++++++++++++
 sc68-format.patch         | 11 ++++++
 sc68-info.patch           | 23 ++++++++++++
 sc68-link.patch           | 20 ++++++++++
 sc68-opt.patch            | 18 +++++++++
 sc68-system-unice68.patch | 95 +++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 208 insertions(+)
---
diff --git a/sc68-devel.patch b/sc68-devel.patch
new file mode 100644
index 0000000..f87c7bb
--- /dev/null
+++ b/sc68-devel.patch
@@ -0,0 +1,41 @@
+--- sc68-2.2.1/sc68.pc.in.orig	2003-09-25 20:26:52.000000000 +0200
++++ sc68-2.2.1/sc68.pc.in	2023-06-24 08:51:33.087400178 +0200
+@@ -15,4 +15,4 @@ Name: sc68
+ Description: Atari-ST / Amiga music player
+ Version: @VERSION@
+ Libs: -L${libdir} @SC68_LDFLAGS@
+-Cflags: -I${pkgincludedir} @CFLAGS@
++Cflags: -I${pkgincludedir} @MY_CFLAGS@
+--- sc68-2.2.1/configure.ac.orig	2023-06-24 08:51:19.260808417 +0200
++++ sc68-2.2.1/configure.ac	2023-06-24 08:55:27.019466193 +0200
+@@ -78,6 +78,7 @@ SUBDIRS68="$SUBDIRS68 data info man"
+ MY_CFLAGS="-DHAVE_CONFIG_CONFIG68_H=1 -DNO_FALLBACK_CONFIG=1"
+ CFLAGS="$CFLAGS $MY_CFLAGS -Wall"
+ CPPFLAGS="$CPPFLAGS $MY_CFLAGS"
++AC_SUBST(MY_CFLAGS)
+ 
+ # Compiler and companions
+ AC_PROG_CC
+--- sc68-2.2.1/sc68-config.in.orig	2003-09-25 20:26:52.000000000 +0200
++++ sc68-2.2.1/sc68-config.in	2023-06-24 08:56:38.935743256 +0200
+@@ -13,17 +13,16 @@ pkgincludedir="${includedir}/sc68"
+ 
+ modversion="@VERSION@"
+ 
+-cflags="@CFLAGS@"
++cflags="@MY_CFLAGS@"
+ iflags="-I${pkgincludedir}"
+ lflags="@SC68_LDFLAGS@"
+ Lflags="-L${libdir}"
+ 
+ RETURN=""
+ 
+-function VersionToNumber
++VersionToNumber
+ {
+-    local n a b c
+-    local ver="$1"
++    ver="$1"
+ 
+     n=`expr "${ver}" : '[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}$'`
+     if test $n -eq 0; then
diff --git a/sc68-format.patch b/sc68-format.patch
new file mode 100644
index 0000000..b1aae3e
--- /dev/null
+++ b/sc68-format.patch
@@ -0,0 +1,11 @@
+--- sc68-2.2.1/debug68/sc68debug.c.orig	2003-09-23 09:40:53.000000000 +0200
++++ sc68-2.2.1/debug68/sc68debug.c	2023-06-24 08:49:48.081302379 +0200
+@@ -1200,7 +1200,7 @@ int main(int na, char **a)
+ 
+ static void dcom(command_t *com)
+ {
+-  printf(com->com);
++  fputs(com->com, stdout);
+   if(com->altcom!=NULL) printf(" (%s)",com->altcom);
+   if(com->help  !=NULL) printf(" : %s",com->help);
+   if(com->use   !=NULL) printf("\n  usage: %s %s",com->com,com->use);
diff --git a/sc68-info.patch b/sc68-info.patch
new file mode 100644
index 0000000..246a95d
--- /dev/null
+++ b/sc68-info.patch
@@ -0,0 +1,23 @@
+--- sc68-2.2.1/info/sc68.texi.orig	2003-08-30 03:27:08.000000000 +0200
++++ sc68-2.2.1/info/sc68.texi	2023-06-23 19:36:54.545697007 +0200
+@@ -4,9 +4,9 @@
+ 
+ @setfilename sc68.info
+ @settitle sc68 documentation	@c appear page in header
+- at dircategory Sound
++ at dircategory Sound:
+ @direntry
+-* sc68: (sc68).                 Atari ST and Amiga music player
++* sc68: (sc68).				Atari ST and Amiga music player
+ @end direntry
+ @c --- End of Header ---
+ 
+@@ -25,7 +25,7 @@
+ 
+ @titlepage
+ @sp 3
+- at title{sc68 documentation}
++ at title sc68 documentation
+ @subtitle version @value{VERSION}, last updated the @value{UPDATED}
+ @author Benjamin Gerard
+ 
diff --git a/sc68-link.patch b/sc68-link.patch
new file mode 100644
index 0000000..a15b238
--- /dev/null
+++ b/sc68-link.patch
@@ -0,0 +1,20 @@
+--- sc68-2.2.1/file68/Makefile.am.orig	2003-09-25 21:56:14.000000000 +0200
++++ sc68-2.2.1/file68/Makefile.am	2023-06-23 21:34:44.127397796 +0200
+@@ -31,6 +31,7 @@ myheaders=\
+ 
+ lib_LTLIBRARIES = libfile68.la
+ libfile68_la_SOURCES = $(mysources) $(myheaders)
++libfile68_la_LIBADD = -lunice68
+ libfile68_la_LDFLAGS = -version-info 2:1:0 -release @VERSION@ @Z_LIB@
+ libfile68_la_CFLAGS = -Wno-multichar -DSC68_SHARED_DATA_PATH='"$(pkgdatadir)"' $(AM_CFLAGS)
+ 
+--- sc68-2.2.1/api68/Makefile.am.orig	2003-09-30 11:00:05.000000000 +0200
++++ sc68-2.2.1/api68/Makefile.am	2023-06-23 22:41:44.528950745 +0200
+@@ -10,6 +10,7 @@ myheaders=\
+ 
+ lib_LTLIBRARIES = libapi68.la
+ libapi68_la_SOURCES = ${mysources} ${myheaders}
++libapi68_la_LIBADD = $(top_builddir)/io68/libio68.la $(top_builddir)/emu68/libemu68.la $(top_builddir)/file68/libfile68.la
+ libapi68_la_LDFLAGS = -version-info 3:1 -release @VERSION@ 
+ 
+ #EXTRA_DIST = api68.vcproj
diff --git a/sc68-opt.patch b/sc68-opt.patch
new file mode 100644
index 0000000..379f4c6
--- /dev/null
+++ b/sc68-opt.patch
@@ -0,0 +1,18 @@
+--- sc68-2.2.1/configure.ac.orig	2023-06-24 08:45:26.669385235 +0200
++++ sc68-2.2.1/configure.ac	2023-06-24 08:51:19.260808417 +0200
+@@ -75,13 +75,8 @@ SUBDIRS68="$SUBDIRS68 as68 sc68 info68 s
+ SUBDIRS68="$SUBDIRS68 data info man"
+ 
+ # C-flags
+-MY_CFLAGS="-DHAVE_CONFIG_CONFIG68_H=1 -DNO_FALLBACK_CONFIG=1"
+-if test "x$enable_debug" = "xyes"; then
+-    MY_CFLAGS="$MY_CFLAGS -Wall -g -O"
+-else
+-    MY_CFLAGS="$MY_CFLAGS -Wall -O3 -fomit-frame-pointer"
+-fi
++MY_CFLAGS="-DHAVE_CONFIG_CONFIG68_H=1 -DNO_FALLBACK_CONFIG=1"
+-CFLAGS="$CFLAGS $MY_CFLAGS"
++CFLAGS="$CFLAGS $MY_CFLAGS -Wall"
+ CPPFLAGS="$CPPFLAGS $MY_CFLAGS"
+ 
+ # Compiler and companions
diff --git a/sc68-system-unice68.patch b/sc68-system-unice68.patch
new file mode 100644
index 0000000..af072a7
--- /dev/null
+++ b/sc68-system-unice68.patch
@@ -0,0 +1,95 @@
+--- sc68-2.2.1/Makefile.am.orig	2003-09-25 22:03:42.000000000 +0200
++++ sc68-2.2.1/Makefile.am	2023-06-23 20:16:46.019407948 +0200
+@@ -51,7 +51,6 @@ my_install_headers =\
+  ./io68/ym_io.h\
+  ./io68/ymemul.h\
+  ./io68/ymoutorg.h\
+- ./unice68/unice68.h\
+  ./config68.h\
+  ./config_option68.h\
+  ./config_package68.h\
+--- sc68-2.2.1/configure.ac.orig	2003-09-30 11:58:46.000000000 +0200
++++ sc68-2.2.1/configure.ac	2023-06-23 20:17:11.545936326 +0200
+@@ -68,7 +68,7 @@ AC_SUBST(REPLAY_RATE_MIN)
+ # #
+ 
+ # Libraries
+-SUBDIRS68="emu68 emu68debug io68 desa68 unice68 file68 api68"
++SUBDIRS68="emu68 emu68debug io68 desa68 file68 api68"
+ # Programs
+ SUBDIRS68="$SUBDIRS68 as68 sc68 info68 sourcer68 debug68"
+ # Data
+@@ -260,7 +260,6 @@ AC_CONFIG_FILES([
+  info68/Makefile
+  debug68/Makefile
+  sourcer68/Makefile
+- unice68/Makefile
+  man/Makefile
+  info/Makefile
+  doc/Makefile
+--- sc68-2.2.1/debug68/Makefile.am.orig	2003-09-25 21:55:21.000000000 +0200
++++ sc68-2.2.1/debug68/Makefile.am	2023-06-23 20:17:58.522348500 +0200
+@@ -18,7 +18,7 @@ bin_PROGRAMS = debug68
+ debug68_SOURCES = $(mysources) $(myheaders)
+ debug68_LDADD = \
+  ../file68/libfile68.la\
+- ../unice68/libunice68.la\
++ -lunice68\
+  ../desa68/libdesa68.la\
+  ../emu68debug/libemu68dbg.la
+ debug68_CFLAGS = -DEMU68DEBUG=1 ${AM_CFLAGS}
+--- sc68-2.2.1/info68/Makefile.am.orig	2003-09-25 21:56:24.000000000 +0200
++++ sc68-2.2.1/info68/Makefile.am	2023-06-23 20:18:26.538863388 +0200
+@@ -1,4 +1,4 @@
+ bin_PROGRAMS = info68
+ info68_SOURCES = info68.c info68_doc.h
+-info68_LDADD = ../file68/libfile68.la ../unice68/libunice68.la
++info68_LDADD = ../file68/libfile68.la -lunice68
+ #EXTRA_DIST = info68.vcproj
+--- sc68-2.2.1/sc68/Makefile.am.orig	2003-09-25 21:56:36.000000000 +0200
++++ sc68-2.2.1/sc68/Makefile.am	2023-06-23 20:19:18.851913317 +0200
+@@ -3,7 +3,7 @@ sc68_SOURCES = sc68.c sc68_doc.h
+ sc68_LDADD =\
+  ../api68/libapi68.la\
+  ../file68/libfile68.la\
+- ../unice68/libunice68.la\
++ -lunice68\
+  ../io68/libio68.la\
+  ../emu68/libemu68.la
+ 
+--- sc68-2.2.1/sourcer68/Makefile.am.orig	2003-09-25 21:56:40.000000000 +0200
++++ sc68-2.2.1/sourcer68/Makefile.am	2023-06-23 20:19:40.945126961 +0200
+@@ -2,7 +2,7 @@ bin_PROGRAMS = sourcer68
+ sourcer68_SOURCES = sourcer68.c sourcer68_doc.h
+ sourcer68_LDADD = \
+  ../file68/libfile68.la\
+- ../unice68/libunice68.la\
++ -lunice68\
+  ../desa68/libdesa68.la\
+  ../emu68debug/libemu68dbg.la
+ sourcer68_CFLAGS =\
+--- sc68-2.2.1/file68/ice68.c.orig	2003-09-22 17:20:34.000000000 +0200
++++ sc68-2.2.1/file68/ice68.c	2023-06-23 20:57:40.052779975 +0200
+@@ -24,11 +24,11 @@
+ #include "file68/error68.h"
+ #include "file68/alloc68.h"
+ #include "file68/istream68_file.h"
+-#include "unice68/unice68.h"
++#include <unice68.h>
+ 
+ int ice_is_magic(const void * buffer)
+ {
+-  return unice68_get_depacked_size(buffer, 0) > 0;
++  return unice68_depacked_size(buffer, 0) > 0;
+ }
+ 
+ void *ice_load(istream_t *is, int *ulen)
+@@ -45,7 +45,7 @@ void *ice_load(istream_t *is, int *ulen)
+   }
+ 
+   csize = 0;
+-  dsize = unice68_get_depacked_size(header, &csize);
++  dsize = unice68_depacked_size(header, &csize);
+ 
+   if (dsize < 0) {
+     SC68error_add("ice_load(%s) : not ICE!", fname);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sc68.git/commitdiff/9dd50beb3b50a6392cc34a0e12776e8caf4fbdc5

More information about the pld-cvs-commit mailing list