From e3aadef7eaf8f2e1d98a80404d557c64267a1d2a Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 14:35:54 +0000 Subject: [PATCH 01/65] Initialize branch FC-6 for adplug --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From efc009cf865c6090c7df4610f7f25c872960c72c Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 11 Apr 2007 21:48:18 +0000 Subject: [PATCH 02/65] New upstream version. --- .cvsignore | 4 ++-- adplug.spec | 17 +++++++++++++---- sources | 4 ++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index f9ce854..0ffcc33 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -adplug-2.0.1.tar.bz2 -adplug.db +adplug-2.1.tar.bz2 +adplugdb-2006-07-07.tar.gz diff --git a/adplug.spec b/adplug.spec index 0036243..2769c7b 100644 --- a/adplug.spec +++ b/adplug.spec @@ -1,14 +1,15 @@ # SPEC file for AdPlug, primary target is the Fedora Extras # RPM repository. +%define adplugdbver 2006-07-07 Name: adplug -Version: 2.0.1 -Release: 2%{?dist} +Version: 2.1 +Release: 1%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Source1: http://download.sourceforge.net/%{name}/adplug.db +Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz Patch0: adplug-1.5.1-texinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL @@ -44,6 +45,10 @@ This package contains development files for the AdPlug AdLib %setup -q # This removes the version.texi dependency %patch0 -p1 +tar xvfz %{SOURCE1} +# Include these by different name +mv %{adplugdbver}/README README.adplugdb +mv %{adplugdbver}/NEWS NEWS.adplugdb %build %configure --disable-static --sharedstatedir=%{shareddata} --disable-rpath @@ -55,7 +60,7 @@ make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_infodir}/dir mkdir -p $RPM_BUILD_ROOT%{shareddata}/%{name} -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{shareddata}/%{name} +install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -80,6 +85,7 @@ fi %{_bindir}/adplugdb %{_mandir}/man1/adplugdb.1* %doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO +%doc NEWS.adplugdb README.adplugdb %files devel %defattr(-, root, root) @@ -90,6 +96,9 @@ fi %{_infodir}/*.gz %changelog +* Wed Apr 11 2007 Linus Walleij 2.1-1 +- New upstream version. + * Tue Aug 29 2006 Linus Walleij 2.0.1-2 - Rebuild for Fedora Extras 6. diff --git a/sources b/sources index 2713040..318ee1a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b3e469e3437d29a79a1ab5febe220f17 adplug-2.0.1.tar.bz2 -5cbd3df5537700f28c350dbe08695c28 adplug.db +bc75cf9d1d2241e287e2eb80b84bd2cd adplug-2.1.tar.bz2 +40a1cc1222c7318172ee3740c4269df3 adplugdb-2006-07-07.tar.gz From 9fde8079047552ee59df38ed064e0318b2d20a54 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 17 Aug 2007 20:01:01 +0000 Subject: [PATCH 03/65] License update from LGPL to LGPLv2+ --- adplug.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/adplug.spec b/adplug.spec index 2769c7b..f7508a2 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -12,7 +12,7 @@ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz Patch0: adplug-1.5.1-texinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -License: LGPL +License: LGPLv2+ BuildRequires: libbinio-devel >= 1.4 BuildRequires: pkgconfig BuildRequires: texinfo @@ -96,6 +96,9 @@ fi %{_infodir}/*.gz %changelog +* Fri Aug 17 2007 Linus Walleij 2.1-2 +- License field update LGPL to LGPLv2+ + * Wed Apr 11 2007 Linus Walleij 2.1-1 - New upstream version. From 4f18b6bb90abe8b001aed6fc0c6da751b66c19ef Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 18 Jan 2008 20:36:03 +0000 Subject: [PATCH 04/65] New glibc wants rebuild. --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index f7508a2..dc805e1 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -96,6 +96,9 @@ fi %{_infodir}/*.gz %changelog +* Fri Jan 18 2008 Linus Walleij 2.1-3 +- New glibc ABI needs rebuild. + * Fri Aug 17 2007 Linus Walleij 2.1-2 - License field update LGPL to LGPLv2+ From 97c9cf266cb6fb70f23e3a78bd2ce6002d7732d2 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 11 Feb 2008 08:25:34 +0000 Subject: [PATCH 05/65] Rebuild for GCC 4.3 --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index dc805e1..3eef44e 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -96,6 +96,9 @@ fi %{_infodir}/*.gz %changelog +* Mon Feb 11 2008 Linus Walleij 2.1-4 +- Rebuild for GCC 4.3. + * Fri Jan 18 2008 Linus Walleij 2.1-3 - New glibc ABI needs rebuild. From 7d8da1f1cc1242af456b7a5c69920488f8f345b0 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 11 Feb 2008 09:12:36 +0000 Subject: [PATCH 06/65] Add a Debian-derived include patch to see if it helps. --- adplug-2.1-include.patch | 88 ++++++++++++++++++++++++++++++++++++++++ adplug.spec | 9 +++- 2 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 adplug-2.1-include.patch diff --git a/adplug-2.1-include.patch b/adplug-2.1-include.patch new file mode 100644 index 0000000..e4dc5ca --- /dev/null +++ b/adplug-2.1-include.patch @@ -0,0 +1,88 @@ +diff -Naur adplug-1.5.1.orig/adplugdb/adplugdb.cpp adplug-1.5.1/adplugdb/adplugdb.cpp +--- adplug-1.5.1.orig/adplugdb/adplugdb.cpp 2004-08-08 19:20:07.000000000 +0000 ++++ adplug-1.5.1/adplugdb/adplugdb.cpp 2005-10-29 15:01:35.233532720 +0000 +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +diff -Naur adplug-1.5.1.orig/src/adplug.cpp adplug-1.5.1/src/adplug.cpp +--- adplug-1.5.1.orig/src/adplug.cpp 2005-05-12 16:48:10.000000000 +0000 ++++ adplug-1.5.1/src/adplug.cpp 2005-10-29 15:01:45.570961192 +0000 +@@ -20,7 +20,7 @@ + */ + + #include +-#include ++#include + + #include "adplug.h" + #include "debug.h" +diff -Naur adplug-1.5.1.orig/src/database.cpp adplug-1.5.1/src/database.cpp +--- adplug-1.5.1.orig/src/database.cpp 2003-03-01 18:51:59.000000000 +0000 ++++ adplug-1.5.1/src/database.cpp 2005-10-29 15:02:52.226827960 +0000 +@@ -21,8 +21,8 @@ + * Copyright (c) 2002, 2003 Simon Peter + */ + +-#include +-#include ++#include ++#include + #include + + #include "database.h" +diff -Naur adplug-1.5.1.orig/src/database.h adplug-1.5.1/src/database.h +--- adplug-1.5.1.orig/src/database.h 2003-03-01 18:51:59.000000000 +0000 ++++ adplug-1.5.1/src/database.h 2005-10-29 15:02:36.282251904 +0000 +@@ -26,7 +26,7 @@ + + #include + #include +-#include ++#include + + class CAdPlugDatabase + { +diff -Naur adplug-1.5.1.orig/src/dmo.cpp adplug-1.5.1/src/dmo.cpp +--- adplug-1.5.1.orig/src/dmo.cpp 2004-09-02 19:48:12.000000000 +0000 ++++ adplug-1.5.1/src/dmo.cpp 2005-10-29 15:03:10.603034352 +0000 +@@ -26,7 +26,7 @@ + */ + + #include +-#include ++#include + + #include "dmo.h" + #include "debug.h" +diff -Naur adplug-1.5.1.orig/src/fprovide.cpp adplug-1.5.1/src/fprovide.cpp +--- adplug-1.5.1.orig/src/fprovide.cpp 2003-02-17 16:42:50.000000000 +0000 ++++ adplug-1.5.1/src/fprovide.cpp 2005-10-29 15:02:43.765114336 +0000 +@@ -20,8 +20,8 @@ + */ + + #include +-#include +-#include ++#include ++#include + + #include "fprovide.h" + +diff -Naur adplug-1.5.1.orig/src/fprovide.h adplug-1.5.1/src/fprovide.h +--- adplug-1.5.1.orig/src/fprovide.h 2003-01-28 13:34:35.000000000 +0000 ++++ adplug-1.5.1/src/fprovide.h 2005-10-29 15:02:27.742550136 +0000 +@@ -23,7 +23,7 @@ + #define H_ADPLUG_FILEPROVIDER + + #include +-#include ++#include + + class CFileProvider + { diff --git a/adplug.spec b/adplug.spec index 3eef44e..678faaa 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,13 +4,16 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz Patch0: adplug-1.5.1-texinfo.patch +# Lifted from the debian patchset +# http://ftp.de.debian.org/debian/pool/main/a/adplug/adplug_2.0.1-6.diff.gz +Patch1: adplug-2.1-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPLv2+ BuildRequires: libbinio-devel >= 1.4 @@ -45,6 +48,7 @@ This package contains development files for the AdPlug AdLib %setup -q # This removes the version.texi dependency %patch0 -p1 +%patch1 -p1 tar xvfz %{SOURCE1} # Include these by different name mv %{adplugdbver}/README README.adplugdb @@ -96,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Mon Feb 11 2008 Linus Walleij 2.1-5 +- Patch include directives with a patch derived from Debian. + * Mon Feb 11 2008 Linus Walleij 2.1-4 - Rebuild for GCC 4.3. From fba1acb1478728111cc743844eb5b6e506a20e02 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 11 Feb 2008 09:37:58 +0000 Subject: [PATCH 07/65] Fix up this patch. --- adplug-2.1-include.patch | 91 ++++------------------------------------ 1 file changed, 7 insertions(+), 84 deletions(-) diff --git a/adplug-2.1-include.patch b/adplug-2.1-include.patch index e4dc5ca..b21a1b0 100644 --- a/adplug-2.1-include.patch +++ b/adplug-2.1-include.patch @@ -1,88 +1,11 @@ -diff -Naur adplug-1.5.1.orig/adplugdb/adplugdb.cpp adplug-1.5.1/adplugdb/adplugdb.cpp ---- adplug-1.5.1.orig/adplugdb/adplugdb.cpp 2004-08-08 19:20:07.000000000 +0000 -+++ adplug-1.5.1/adplugdb/adplugdb.cpp 2005-10-29 15:01:35.233532720 +0000 -@@ -26,7 +26,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff -Naur adplug-1.5.1.orig/src/adplug.cpp adplug-1.5.1/src/adplug.cpp ---- adplug-1.5.1.orig/src/adplug.cpp 2005-05-12 16:48:10.000000000 +0000 -+++ adplug-1.5.1/src/adplug.cpp 2005-10-29 15:01:45.570961192 +0000 -@@ -20,7 +20,7 @@ +diff -ur adplug-2.1-orig/src/adplug.cpp adplug-2.1/src/adplug.cpp +--- adplug-2.1-orig/src/adplug.cpp 2008-02-11 10:28:41.000000000 +0100 ++++ adplug-2.1/src/adplug.cpp 2008-02-11 10:29:53.000000000 +0100 +@@ -19,6 +19,7 @@ + * adplug.cpp - CAdPlug utility class, by Simon Peter */ ++#include #include --#include -+#include + #include - #include "adplug.h" - #include "debug.h" -diff -Naur adplug-1.5.1.orig/src/database.cpp adplug-1.5.1/src/database.cpp ---- adplug-1.5.1.orig/src/database.cpp 2003-03-01 18:51:59.000000000 +0000 -+++ adplug-1.5.1/src/database.cpp 2005-10-29 15:02:52.226827960 +0000 -@@ -21,8 +21,8 @@ - * Copyright (c) 2002, 2003 Simon Peter - */ - --#include --#include -+#include -+#include - #include - - #include "database.h" -diff -Naur adplug-1.5.1.orig/src/database.h adplug-1.5.1/src/database.h ---- adplug-1.5.1.orig/src/database.h 2003-03-01 18:51:59.000000000 +0000 -+++ adplug-1.5.1/src/database.h 2005-10-29 15:02:36.282251904 +0000 -@@ -26,7 +26,7 @@ - - #include - #include --#include -+#include - - class CAdPlugDatabase - { -diff -Naur adplug-1.5.1.orig/src/dmo.cpp adplug-1.5.1/src/dmo.cpp ---- adplug-1.5.1.orig/src/dmo.cpp 2004-09-02 19:48:12.000000000 +0000 -+++ adplug-1.5.1/src/dmo.cpp 2005-10-29 15:03:10.603034352 +0000 -@@ -26,7 +26,7 @@ - */ - - #include --#include -+#include - - #include "dmo.h" - #include "debug.h" -diff -Naur adplug-1.5.1.orig/src/fprovide.cpp adplug-1.5.1/src/fprovide.cpp ---- adplug-1.5.1.orig/src/fprovide.cpp 2003-02-17 16:42:50.000000000 +0000 -+++ adplug-1.5.1/src/fprovide.cpp 2005-10-29 15:02:43.765114336 +0000 -@@ -20,8 +20,8 @@ - */ - - #include --#include --#include -+#include -+#include - - #include "fprovide.h" - -diff -Naur adplug-1.5.1.orig/src/fprovide.h adplug-1.5.1/src/fprovide.h ---- adplug-1.5.1.orig/src/fprovide.h 2003-01-28 13:34:35.000000000 +0000 -+++ adplug-1.5.1/src/fprovide.h 2005-10-29 15:02:27.742550136 +0000 -@@ -23,7 +23,7 @@ - #define H_ADPLUG_FILEPROVIDER - - #include --#include -+#include - - class CFileProvider - { From 7e58a27908a79495bf424f463e8414d9089c6e6b Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 11 Feb 2008 13:03:39 +0000 Subject: [PATCH 08/65] Shaped up the patch for GCC 4.3 --- adplug-2.1-include.patch | 224 ++++++++++++++++++++++++++++++++++++++- adplug.spec | 5 +- 2 files changed, 226 insertions(+), 3 deletions(-) diff --git a/adplug-2.1-include.patch b/adplug-2.1-include.patch index b21a1b0..88ffe69 100644 --- a/adplug-2.1-include.patch +++ b/adplug-2.1-include.patch @@ -1,6 +1,28 @@ +diff -ur adplug-2.1-orig/src/a2m.cpp adplug-2.1/src/a2m.cpp +--- adplug-2.1-orig/src/a2m.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/a2m.cpp 2008-02-11 13:31:41.000000000 +0100 +@@ -29,6 +29,7 @@ + * Following commands are ignored: Gxy, Hxy, Kxy - &xy + */ + ++#include + #include "a2m.h" + + const unsigned int Ca2mLoader::MAXFREQ = 2000, +diff -ur adplug-2.1-orig/src/adl.cpp adplug-2.1/src/adl.cpp +--- adplug-2.1-orig/src/adl.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/adl.cpp 2008-02-11 13:59:04.000000000 +0100 +@@ -48,6 +48,7 @@ + * + */ + ++#include + #include + #include + #include diff -ur adplug-2.1-orig/src/adplug.cpp adplug-2.1/src/adplug.cpp ---- adplug-2.1-orig/src/adplug.cpp 2008-02-11 10:28:41.000000000 +0100 -+++ adplug-2.1/src/adplug.cpp 2008-02-11 10:29:53.000000000 +0100 +--- adplug-2.1-orig/src/adplug.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/adplug.cpp 2008-02-11 13:19:49.000000000 +0100 @@ -19,6 +19,7 @@ * adplug.cpp - CAdPlug utility class, by Simon Peter */ @@ -9,3 +31,201 @@ diff -ur adplug-2.1-orig/src/adplug.cpp adplug-2.1/src/adplug.cpp #include #include +diff -ur adplug-2.1-orig/src/bmf.cpp adplug-2.1/src/bmf.cpp +--- adplug-2.1-orig/src/bmf.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/bmf.cpp 2008-02-11 13:51:49.000000000 +0100 +@@ -40,6 +40,7 @@ + comment : inaccurate replaying, because constant outport; in original player it can be 380 or 382. + */ + ++#include + #include "bmf.h" + #include "debug.h" + +diff -ur adplug-2.1-orig/src/cff.cpp adplug-2.1/src/cff.cpp +--- adplug-2.1-orig/src/cff.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/cff.cpp 2008-02-11 13:33:54.000000000 +0100 +@@ -24,6 +24,7 @@ + slides use previous effect data instead of current. + */ + ++#include + #include + + #include "cff.h" +diff -ur adplug-2.1-orig/src/dro.cpp adplug-2.1/src/dro.cpp +--- adplug-2.1-orig/src/dro.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/dro.cpp 2008-02-11 13:56:05.000000000 +0100 +@@ -23,6 +23,7 @@ + * NOTES: 3-oct-04: the DRO format is not yet finalized. beware. + */ + ++#include + #include + + #include "dro.h" +diff -ur adplug-2.1-orig/src/dtm.cpp adplug-2.1/src/dtm.cpp +--- adplug-2.1-orig/src/dtm.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/dtm.cpp 2008-02-11 13:37:45.000000000 +0100 +@@ -22,6 +22,7 @@ + NOTE: Panning (Ex) effect is ignored. + */ + ++#include + #include "dtm.h" + + /* -------- Public Methods -------------------------------- */ +diff -ur adplug-2.1-orig/src/fmc.cpp adplug-2.1/src/fmc.cpp +--- adplug-2.1-orig/src/fmc.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/fmc.cpp 2008-02-11 13:41:19.000000000 +0100 +@@ -19,6 +19,7 @@ + fmc.cpp - FMC Loader by Riven the Mage + */ + ++#include + #include "fmc.h" + + /* -------- Public Methods -------------------------------- */ +diff -ur adplug-2.1-orig/src/mad.cpp adplug-2.1/src/mad.cpp +--- adplug-2.1-orig/src/mad.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/mad.cpp 2008-02-11 13:31:50.000000000 +0100 +@@ -19,6 +19,7 @@ + mad.cpp - MAD loader by Riven the Mage + */ + ++#include + #include "mad.h" + + /* -------- Public Methods -------------------------------- */ +diff -ur adplug-2.1-orig/src/mkj.cpp adplug-2.1/src/mkj.cpp +--- adplug-2.1-orig/src/mkj.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/mkj.cpp 2008-02-11 13:32:55.000000000 +0100 +@@ -19,6 +19,7 @@ + * mkj.cpp - MKJamz Player, by Simon Peter + */ + ++#include + #include + + #include "mkj.h" +diff -ur adplug-2.1-orig/src/msc.cpp adplug-2.1/src/msc.cpp +--- adplug-2.1-orig/src/msc.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/msc.cpp 2008-02-11 13:57:26.000000000 +0100 +@@ -19,6 +19,7 @@ + * msc.c - MSC Player by Lubomir Bulej (pallas@kadan.cz) + */ + ++#include + #include + + #include "msc.h" +diff -ur adplug-2.1-orig/src/mtk.cpp adplug-2.1/src/mtk.cpp +--- adplug-2.1-orig/src/mtk.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/mtk.cpp 2008-02-11 13:37:52.000000000 +0100 +@@ -19,6 +19,7 @@ + * mtk.cpp - MPU-401 Trakker Loader by Simon Peter (dn.tlp@gmx.net) + */ + ++#include + #include "mtk.h" + + /*** public methods **************************************/ +diff -ur adplug-2.1-orig/src/protrack.cpp adplug-2.1/src/protrack.cpp +--- adplug-2.1-orig/src/protrack.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/protrack.cpp 2008-02-11 13:28:23.000000000 +0100 +@@ -25,6 +25,7 @@ + * Protracker-like format, this is most certainly the player you want to use. + */ + ++#include + #include "protrack.h" + #include "debug.h" + +diff -ur adplug-2.1-orig/src/rad.cpp adplug-2.1/src/rad.cpp +--- adplug-2.1-orig/src/rad.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/rad.cpp 2008-02-11 13:43:51.000000000 +0100 +@@ -22,6 +22,7 @@ + * some volumes are dropped out + */ + ++#include + #include "rad.h" + + CPlayer *CradLoader::factory(Copl *newopl) +diff -ur adplug-2.1-orig/src/rat.cpp adplug-2.1/src/rat.cpp +--- adplug-2.1-orig/src/rat.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/rat.cpp 2008-02-11 13:53:20.000000000 +0100 +@@ -29,6 +29,7 @@ + comment : there are bug in original replayer's adlib_init(): wrong frequency registers. + */ + ++#include + #include "rat.h" + #include "debug.h" + +diff -ur adplug-2.1-orig/src/raw.cpp adplug-2.1/src/raw.cpp +--- adplug-2.1-orig/src/raw.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/raw.cpp 2008-02-11 13:49:33.000000000 +0100 +@@ -19,6 +19,7 @@ + * raw.c - RAW Player by Simon Peter + */ + ++#include + #include "raw.h" + + /*** public methods *************************************/ +diff -ur adplug-2.1-orig/src/rix.cpp adplug-2.1/src/rix.cpp +--- adplug-2.1-orig/src/rix.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/rix.cpp 2008-02-11 14:00:37.000000000 +0100 +@@ -20,6 +20,7 @@ + * BSPAL + */ + ++#include + #include "rix.h" + #include "debug.h" + +diff -ur adplug-2.1-orig/src/rol.cpp adplug-2.1/src/rol.cpp +--- adplug-2.1-orig/src/rol.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/rol.cpp 2008-02-11 13:54:42.000000000 +0100 +@@ -20,6 +20,7 @@ + * + * Visit: http://tenacity.hispeed.com/aomit/oplx/ + */ ++#include + #include + + #include "rol.h" +diff -ur adplug-2.1-orig/src/s3m.cpp adplug-2.1/src/s3m.cpp +--- adplug-2.1-orig/src/s3m.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/s3m.cpp 2008-02-11 13:34:54.000000000 +0100 +@@ -22,6 +22,7 @@ + * Extra Fine Slides (EEx, FEx) & Fine Vibrato (Uxy) are inaccurate + */ + ++#include + #include "s3m.h" + + const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion +diff -ur adplug-2.1-orig/src/sa2.cpp adplug-2.1/src/sa2.cpp +--- adplug-2.1-orig/src/sa2.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/sa2.cpp 2008-02-11 13:50:40.000000000 +0100 +@@ -20,6 +20,7 @@ + * SAdT Loader by Mamiya + */ + ++#include + #include + + #include "sa2.h" +diff -ur adplug-2.1-orig/src/sng.cpp adplug-2.1/src/sng.cpp +--- adplug-2.1-orig/src/sng.cpp 2008-02-11 13:19:21.000000000 +0100 ++++ adplug-2.1/src/sng.cpp 2008-02-11 13:20:27.000000000 +0100 +@@ -19,6 +19,7 @@ + * sng.cpp - SNG Player by Simon Peter + */ + ++#include + #include "sng.h" + + CPlayer *CsngPlayer::factory(Copl *newopl) diff --git a/adplug.spec b/adplug.spec index 678faaa..e003c63 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -100,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Mon Feb 11 2008 Linus Walleij 2.1-6 +- Nailed the GCC build problems to numerous include . + * Mon Feb 11 2008 Linus Walleij 2.1-5 - Patch include directives with a patch derived from Debian. From 3b93cb7d08e3b12c803c47072d50b8c22ed35c7f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 00:13:24 +0000 Subject: [PATCH 09/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index e003c63..eb77603 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -100,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 2.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 11 2008 Linus Walleij 2.1-6 - Nailed the GCC build problems to numerous include . From 26ad851e1277d2688537f4a7072b6b3103e499b1 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:36:53 +0000 Subject: [PATCH 10/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index eb77603..7fffd72 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -100,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From c08a892b5afb65929dd73bc4f4c0dfc359d822cf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:35 +0000 Subject: [PATCH 11/65] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8972c36..9e4e8b3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := adplug SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 765a82e0426cfc64472c20485f9d32e5238dd485 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:17 +0000 Subject: [PATCH 12/65] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8972c36..9e4e8b3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := adplug SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4a93784528c67aa5482d739c459c9d11df219ccf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:36:42 +0000 Subject: [PATCH 13/65] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9e4e8b3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: adplug -# $Id$ -NAME := adplug -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From cd1174e212d217a54d06401ce5580d80fc4d2268 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:36:45 +0000 Subject: [PATCH 14/65] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9e4e8b3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: adplug -# $Id$ -NAME := adplug -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6 From aef12c4bbc76d34335d946e16881340895513e58 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:28:41 -0600 Subject: [PATCH 15/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 7fffd72..b641158 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -100,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 2.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Jul 24 2009 Fedora Release Engineering - 2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From d99bc098a46443c72986937243f78b761d13e8ce Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:02:11 -0600 Subject: [PATCH 16/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index b641158..747a17e 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -100,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 2.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 2.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 05f15d8a1aab58af6e274c1640d675a88778371d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 11:39:52 -0600 Subject: [PATCH 17/65] - Rebuilt for c++ ABI breakage --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 747a17e..9dc9ab7 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -100,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 2.1-11 +- Rebuilt for c++ ABI breakage + * Thu Jan 12 2012 Fedora Release Engineering - 2.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 3ea61428a765c4de9a0f5792cfcedd37149f53b3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:36:59 -0500 Subject: [PATCH 18/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 9dc9ab7..0b8e9dd 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -100,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 2.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Feb 28 2012 Fedora Release Engineering - 2.1-11 - Rebuilt for c++ ABI breakage From d235738b68e15ea5aafd13e75896e3bb33f491b5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:19:46 -0600 Subject: [PATCH 19/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 0b8e9dd..4cbc1fd 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -100,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 2.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 2.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From b3a6d88ae6fc607586e035fc85271b4805b90b5c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:19:24 -0500 Subject: [PATCH 20/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 4cbc1fd..3dea9a6 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -100,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 2.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From b3c4de5a49095756016a3d7482a76b4f56358d8a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:10:50 -0500 Subject: [PATCH 21/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 3dea9a6..ab67fba 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -100,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 2.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 8289e233af4d2e8e4d64aab3146592bfa935fed7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 20:04:02 +0000 Subject: [PATCH 22/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index ab67fba..6895abc 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -100,6 +100,9 @@ fi %{_infodir}/*.gz %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 2.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 2.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 5e410ac755e54a1fc06c4d683872202d72f83304 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Fri, 20 Feb 2015 00:27:40 +0100 Subject: [PATCH 23/65] Drop buildroot tag, %defattr, %clean. - Fix -devel group tag. - Add %_isa to -devel base package dep. - Rebuild for libbinio (GCC 5 C++ ABI change), so deps can compile/link with this. --- adplug.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/adplug.spec b/adplug.spec index 6895abc..85f9619 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -14,7 +14,6 @@ Patch0: adplug-1.5.1-texinfo.patch # Lifted from the debian patchset # http://ftp.de.debian.org/debian/pool/main/a/adplug/adplug_2.0.1-6.diff.gz Patch1: adplug-2.1-include.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPLv2+ BuildRequires: libbinio-devel >= 1.4 BuildRequires: pkgconfig @@ -34,8 +33,8 @@ playback. It supports various audio formats from MS-DOS AdLib trackers. %package devel Summary: Development files for AdPlug -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libbinio-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -66,9 +65,6 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir mkdir -p $RPM_BUILD_ROOT%{shareddata}/%{name} install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -82,7 +78,6 @@ if [ $1 = 0 ]; then fi %files -%defattr(-, root, root) %{_libdir}/*.so.* %dir %{shareddata}/%{name}/ %config(noreplace) %{shareddata}/%{name}/adplug.db @@ -92,7 +87,6 @@ fi %doc NEWS.adplugdb README.adplugdb %files devel -%defattr(-, root, root) %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %dir %{_includedir}/%{name} @@ -100,6 +94,12 @@ fi %{_infodir}/*.gz %changelog +* Thu Feb 19 2015 Michael Schwendt - 2.1-17 +- Drop buildroot tag, %%defattr, %%clean. +- Fix -devel group tag. +- Add %%_isa to -devel base package dep. +- Rebuild for libbinio (GCC 5 C++ ABI change), so deps can compile/link with this. + * Fri Aug 15 2014 Fedora Release Engineering - 2.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 656819d676a8f87902ae4e27f088e38a589bb148 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 11:37:57 +0200 Subject: [PATCH 24/65] Rebuilt for GCC 5 C++11 ABI change --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 85f9619..34e8512 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -94,6 +94,9 @@ fi %{_infodir}/*.gz %changelog +* Sat May 02 2015 Kalev Lember - 2.1-18 +- Rebuilt for GCC 5 C++11 ABI change + * Thu Feb 19 2015 Michael Schwendt - 2.1-17 - Drop buildroot tag, %%defattr, %%clean. - Fix -devel group tag. From 5affb5d19b6e8aed09d6fcaaac4372bc43f07bbc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:39:06 +0000 Subject: [PATCH 25/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 34e8512..612fdcc 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -94,6 +94,9 @@ fi %{_infodir}/*.gz %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 2.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 2.1-18 - Rebuilt for GCC 5 C++11 ABI change From f3bbbbd21cf97a3f4870eacd8b4833e191cdb0e2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:00:29 +0000 Subject: [PATCH 26/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 612fdcc..1951fc9 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -94,6 +94,9 @@ fi %{_infodir}/*.gz %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jun 16 2015 Fedora Release Engineering - 2.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From fa59ad202d36159ccf32a2b1e33427f1f29b9b2c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 8 Mar 2016 01:10:41 -0600 Subject: [PATCH 27/65] Fix FTBFS with GCC 6 (#1307307) --- adplug-2.1-gcc6.patch | 23 +++++++++++++++++++++++ adplug.spec | 8 +++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 adplug-2.1-gcc6.patch diff --git a/adplug-2.1-gcc6.patch b/adplug-2.1-gcc6.patch new file mode 100644 index 0000000..79dc342 --- /dev/null +++ b/adplug-2.1-gcc6.patch @@ -0,0 +1,23 @@ +diff -upr a/src/s3m.cpp b/src/s3m.cpp +--- a/src/s3m.cpp 2006-07-02 00:27:00.000000000 -0500 ++++ b/src/s3m.cpp 2016-03-07 23:20:56.039017533 -0600 +@@ -25,7 +25,7 @@ + #include + #include "s3m.h" + +-const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion ++const signed char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1}; + + const unsigned short Cs3mPlayer::notetable[12] = // S3M adlib note table +--- a/src/s3m.h 2006-05-13 00:36:42.000000000 -0500 ++++ b/src/s3m.h 2016-03-08 00:56:07.953972552 -0600 +@@ -90,7 +90,7 @@ class Cs3mPlayer: public CPlayer + unsigned char crow,ord,speed,tempo,del,songend,loopstart,loopcnt; + + private: +- static const char chnresolv[]; ++ static const signed char chnresolv[]; + static const unsigned short notetable[12]; + static const unsigned char vibratotab[32]; + diff --git a/adplug.spec b/adplug.spec index 1951fc9..e809968 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia @@ -14,6 +14,8 @@ Patch0: adplug-1.5.1-texinfo.patch # Lifted from the debian patchset # http://ftp.de.debian.org/debian/pool/main/a/adplug/adplug_2.0.1-6.diff.gz Patch1: adplug-2.1-include.patch +# fix build with GCC 6 (#1307307) +Patch2: adplug-2.1-gcc6.patch License: LGPLv2+ BuildRequires: libbinio-devel >= 1.4 BuildRequires: pkgconfig @@ -48,6 +50,7 @@ This package contains development files for the AdPlug AdLib # This removes the version.texi dependency %patch0 -p1 %patch1 -p1 +%patch2 -p1 tar xvfz %{SOURCE1} # Include these by different name mv %{adplugdbver}/README README.adplugdb @@ -94,6 +97,9 @@ fi %{_infodir}/*.gz %changelog +* Tue Mar 08 2016 Yaakov Selkowitz - 2.1-21 +- Fix FTBFS with GCC 6 (#1307307) + * Wed Feb 03 2016 Fedora Release Engineering - 2.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 59bdb415ce2223bf11d72281dea4a94b6e48f798 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Sun, 12 Jun 2016 16:58:00 +0200 Subject: [PATCH 28/65] New upstream version with fixes --- .gitignore | 2 ++ adplug.spec | 41 +++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 0ffcc33..6c8745f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ adplug-2.1.tar.bz2 adplugdb-2006-07-07.tar.gz +/adplug-2.2.1.tar.gz +/adplug-2.2.1.tar.bz2 diff --git a/adplug.spec b/adplug.spec index e809968..127bb87 100644 --- a/adplug.spec +++ b/adplug.spec @@ -3,34 +3,28 @@ %define adplugdbver 2006-07-07 Name: adplug -Version: 2.1 -Release: 21%{?dist} +Version: 2.2.1 +Release: 1%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz -Patch0: adplug-1.5.1-texinfo.patch -# Lifted from the debian patchset -# http://ftp.de.debian.org/debian/pool/main/a/adplug/adplug_2.0.1-6.diff.gz -Patch1: adplug-2.1-include.patch -# fix build with GCC 6 (#1307307) -Patch2: adplug-2.1-gcc6.patch License: LGPLv2+ BuildRequires: libbinio-devel >= 1.4 BuildRequires: pkgconfig BuildRequires: texinfo -# This is to resolve the endless disputes of the shared data for this +# This is to resolve the endless disputes of the shared data for this # package. Whenever _sharedstatedir contains something acceptable to # Fedora that can be used instead. %define shareddata %{_localstatedir}/lib %description -AdPlug is a free software, cross-platform, hardware independent AdLib -sound player library, mainly written in C++ and released under the -LGPL. AdPlug plays sound data, originally created for the AdLib (OPL2) -audio board, directly from its original format on top of an OPL2 -emulator or by using the real hardware. No OPL chip is required for +AdPlug is a free software, cross-platform, hardware independent AdLib +sound player library, mainly written in C++ and released under the +LGPL. AdPlug plays sound data, originally created for the AdLib (OPL2) +audio board, directly from its original format on top of an OPL2 +emulator or by using the real hardware. No OPL chip is required for playback. It supports various audio formats from MS-DOS AdLib trackers. %package devel @@ -47,16 +41,21 @@ This package contains development files for the AdPlug AdLib %prep %setup -q -# This removes the version.texi dependency -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 tar xvfz %{SOURCE1} # Include these by different name mv %{adplugdbver}/README README.adplugdb mv %{adplugdbver}/NEWS NEWS.adplugdb %build +rm -f ltmain.sh config.guess config.sub +libtoolize --copy --force || fail +rm -f aclocal.m4 +aclocal $ACLOCAL_FLAGS || fail +rm -f depcomp install-sh missing +touch config.rpath +automake --add-missing --gnu || fail +rm -f configure +autoconf %configure --disable-static --sharedstatedir=%{shareddata} --disable-rpath make %{?_smp_mflags} @@ -97,6 +96,12 @@ fi %{_infodir}/*.gz %changelog +* Sun Jun 12 2016 Linus Walleij - 2.2.1-1 +- New upstream version +- Run libtoolize, aclocal, automake and autoconf on build to avoid + rpath problems +- Builds without patches + * Tue Mar 08 2016 Yaakov Selkowitz - 2.1-21 - Fix FTBFS with GCC 6 (#1307307) diff --git a/sources b/sources index 318ee1a..3a8cf58 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bc75cf9d1d2241e287e2eb80b84bd2cd adplug-2.1.tar.bz2 +8f815fd5d254de0fe5df818df9d1d8af adplug-2.2.1.tar.bz2 40a1cc1222c7318172ee3740c4269df3 adplugdb-2006-07-07.tar.gz From b7c6876c824c745724f47b6bd75984be7325a1e1 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Sun, 12 Jun 2016 17:09:09 +0200 Subject: [PATCH 29/65] Fix BR --- adplug.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adplug.spec b/adplug.spec index 127bb87..a981ac2 100644 --- a/adplug.spec +++ b/adplug.spec @@ -14,6 +14,9 @@ License: LGPLv2+ BuildRequires: libbinio-devel >= 1.4 BuildRequires: pkgconfig BuildRequires: texinfo +BuildRequires: libtool +BuildRequires: autoconf +BuildRequires: automake # This is to resolve the endless disputes of the shared data for this # package. Whenever _sharedstatedir contains something acceptable to # Fedora that can be used instead. From b1c9e5c0eaad231548e377fbb4e661baf1a543fc Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Sun, 12 Jun 2016 17:38:19 +0200 Subject: [PATCH 30/65] Declare some chars signed after the ARMv7hf compiler barfed like this: -mfpu=vfpv3-d16 -mfloat-abi=hard -c -o fmc.lo fmc.cpp s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1}; ^ s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] s3m.cpp:29:90: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] I wonder if it helps. --- adplug-1.5.1-texinfo.patch | 11 - adplug-2.1-include.patch | 231 ------------------ ...c6.patch => adplug-2.2.1-signed-char.patch | 13 +- adplug.spec | 2 + 4 files changed, 9 insertions(+), 248 deletions(-) delete mode 100644 adplug-1.5.1-texinfo.patch delete mode 100644 adplug-2.1-include.patch rename adplug-2.1-gcc6.patch => adplug-2.2.1-signed-char.patch (60%) diff --git a/adplug-1.5.1-texinfo.patch b/adplug-1.5.1-texinfo.patch deleted file mode 100644 index b10560d..0000000 --- a/adplug-1.5.1-texinfo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur adplug-1.5.1.orig/doc/libadplug.texi adplug-1.5.1/doc/libadplug.texi ---- adplug-1.5.1.orig/doc/libadplug.texi 2006-01-01 23:49:53.000000000 +0100 -+++ adplug-1.5.1/doc/libadplug.texi 2006-01-01 23:50:04.000000000 +0100 -@@ -1,7 +1,6 @@ - \input texinfo @c -*-texinfo-*- - @c %**start of header - @setfilename libadplug.info --@include version.texi - @settitle AdPlug Core Library @value{VERSION} Manual - @c %**end of header - diff --git a/adplug-2.1-include.patch b/adplug-2.1-include.patch deleted file mode 100644 index 88ffe69..0000000 --- a/adplug-2.1-include.patch +++ /dev/null @@ -1,231 +0,0 @@ -diff -ur adplug-2.1-orig/src/a2m.cpp adplug-2.1/src/a2m.cpp ---- adplug-2.1-orig/src/a2m.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/a2m.cpp 2008-02-11 13:31:41.000000000 +0100 -@@ -29,6 +29,7 @@ - * Following commands are ignored: Gxy, Hxy, Kxy - &xy - */ - -+#include - #include "a2m.h" - - const unsigned int Ca2mLoader::MAXFREQ = 2000, -diff -ur adplug-2.1-orig/src/adl.cpp adplug-2.1/src/adl.cpp ---- adplug-2.1-orig/src/adl.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/adl.cpp 2008-02-11 13:59:04.000000000 +0100 -@@ -48,6 +48,7 @@ - * - */ - -+#include - #include - #include - #include -diff -ur adplug-2.1-orig/src/adplug.cpp adplug-2.1/src/adplug.cpp ---- adplug-2.1-orig/src/adplug.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/adplug.cpp 2008-02-11 13:19:49.000000000 +0100 -@@ -19,6 +19,7 @@ - * adplug.cpp - CAdPlug utility class, by Simon Peter - */ - -+#include - #include - #include - -diff -ur adplug-2.1-orig/src/bmf.cpp adplug-2.1/src/bmf.cpp ---- adplug-2.1-orig/src/bmf.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/bmf.cpp 2008-02-11 13:51:49.000000000 +0100 -@@ -40,6 +40,7 @@ - comment : inaccurate replaying, because constant outport; in original player it can be 380 or 382. - */ - -+#include - #include "bmf.h" - #include "debug.h" - -diff -ur adplug-2.1-orig/src/cff.cpp adplug-2.1/src/cff.cpp ---- adplug-2.1-orig/src/cff.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/cff.cpp 2008-02-11 13:33:54.000000000 +0100 -@@ -24,6 +24,7 @@ - slides use previous effect data instead of current. - */ - -+#include - #include - - #include "cff.h" -diff -ur adplug-2.1-orig/src/dro.cpp adplug-2.1/src/dro.cpp ---- adplug-2.1-orig/src/dro.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/dro.cpp 2008-02-11 13:56:05.000000000 +0100 -@@ -23,6 +23,7 @@ - * NOTES: 3-oct-04: the DRO format is not yet finalized. beware. - */ - -+#include - #include - - #include "dro.h" -diff -ur adplug-2.1-orig/src/dtm.cpp adplug-2.1/src/dtm.cpp ---- adplug-2.1-orig/src/dtm.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/dtm.cpp 2008-02-11 13:37:45.000000000 +0100 -@@ -22,6 +22,7 @@ - NOTE: Panning (Ex) effect is ignored. - */ - -+#include - #include "dtm.h" - - /* -------- Public Methods -------------------------------- */ -diff -ur adplug-2.1-orig/src/fmc.cpp adplug-2.1/src/fmc.cpp ---- adplug-2.1-orig/src/fmc.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/fmc.cpp 2008-02-11 13:41:19.000000000 +0100 -@@ -19,6 +19,7 @@ - fmc.cpp - FMC Loader by Riven the Mage - */ - -+#include - #include "fmc.h" - - /* -------- Public Methods -------------------------------- */ -diff -ur adplug-2.1-orig/src/mad.cpp adplug-2.1/src/mad.cpp ---- adplug-2.1-orig/src/mad.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/mad.cpp 2008-02-11 13:31:50.000000000 +0100 -@@ -19,6 +19,7 @@ - mad.cpp - MAD loader by Riven the Mage - */ - -+#include - #include "mad.h" - - /* -------- Public Methods -------------------------------- */ -diff -ur adplug-2.1-orig/src/mkj.cpp adplug-2.1/src/mkj.cpp ---- adplug-2.1-orig/src/mkj.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/mkj.cpp 2008-02-11 13:32:55.000000000 +0100 -@@ -19,6 +19,7 @@ - * mkj.cpp - MKJamz Player, by Simon Peter - */ - -+#include - #include - - #include "mkj.h" -diff -ur adplug-2.1-orig/src/msc.cpp adplug-2.1/src/msc.cpp ---- adplug-2.1-orig/src/msc.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/msc.cpp 2008-02-11 13:57:26.000000000 +0100 -@@ -19,6 +19,7 @@ - * msc.c - MSC Player by Lubomir Bulej (pallas@kadan.cz) - */ - -+#include - #include - - #include "msc.h" -diff -ur adplug-2.1-orig/src/mtk.cpp adplug-2.1/src/mtk.cpp ---- adplug-2.1-orig/src/mtk.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/mtk.cpp 2008-02-11 13:37:52.000000000 +0100 -@@ -19,6 +19,7 @@ - * mtk.cpp - MPU-401 Trakker Loader by Simon Peter (dn.tlp@gmx.net) - */ - -+#include - #include "mtk.h" - - /*** public methods **************************************/ -diff -ur adplug-2.1-orig/src/protrack.cpp adplug-2.1/src/protrack.cpp ---- adplug-2.1-orig/src/protrack.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/protrack.cpp 2008-02-11 13:28:23.000000000 +0100 -@@ -25,6 +25,7 @@ - * Protracker-like format, this is most certainly the player you want to use. - */ - -+#include - #include "protrack.h" - #include "debug.h" - -diff -ur adplug-2.1-orig/src/rad.cpp adplug-2.1/src/rad.cpp ---- adplug-2.1-orig/src/rad.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/rad.cpp 2008-02-11 13:43:51.000000000 +0100 -@@ -22,6 +22,7 @@ - * some volumes are dropped out - */ - -+#include - #include "rad.h" - - CPlayer *CradLoader::factory(Copl *newopl) -diff -ur adplug-2.1-orig/src/rat.cpp adplug-2.1/src/rat.cpp ---- adplug-2.1-orig/src/rat.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/rat.cpp 2008-02-11 13:53:20.000000000 +0100 -@@ -29,6 +29,7 @@ - comment : there are bug in original replayer's adlib_init(): wrong frequency registers. - */ - -+#include - #include "rat.h" - #include "debug.h" - -diff -ur adplug-2.1-orig/src/raw.cpp adplug-2.1/src/raw.cpp ---- adplug-2.1-orig/src/raw.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/raw.cpp 2008-02-11 13:49:33.000000000 +0100 -@@ -19,6 +19,7 @@ - * raw.c - RAW Player by Simon Peter - */ - -+#include - #include "raw.h" - - /*** public methods *************************************/ -diff -ur adplug-2.1-orig/src/rix.cpp adplug-2.1/src/rix.cpp ---- adplug-2.1-orig/src/rix.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/rix.cpp 2008-02-11 14:00:37.000000000 +0100 -@@ -20,6 +20,7 @@ - * BSPAL - */ - -+#include - #include "rix.h" - #include "debug.h" - -diff -ur adplug-2.1-orig/src/rol.cpp adplug-2.1/src/rol.cpp ---- adplug-2.1-orig/src/rol.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/rol.cpp 2008-02-11 13:54:42.000000000 +0100 -@@ -20,6 +20,7 @@ - * - * Visit: http://tenacity.hispeed.com/aomit/oplx/ - */ -+#include - #include - - #include "rol.h" -diff -ur adplug-2.1-orig/src/s3m.cpp adplug-2.1/src/s3m.cpp ---- adplug-2.1-orig/src/s3m.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/s3m.cpp 2008-02-11 13:34:54.000000000 +0100 -@@ -22,6 +22,7 @@ - * Extra Fine Slides (EEx, FEx) & Fine Vibrato (Uxy) are inaccurate - */ - -+#include - #include "s3m.h" - - const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion -diff -ur adplug-2.1-orig/src/sa2.cpp adplug-2.1/src/sa2.cpp ---- adplug-2.1-orig/src/sa2.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/sa2.cpp 2008-02-11 13:50:40.000000000 +0100 -@@ -20,6 +20,7 @@ - * SAdT Loader by Mamiya - */ - -+#include - #include - - #include "sa2.h" -diff -ur adplug-2.1-orig/src/sng.cpp adplug-2.1/src/sng.cpp ---- adplug-2.1-orig/src/sng.cpp 2008-02-11 13:19:21.000000000 +0100 -+++ adplug-2.1/src/sng.cpp 2008-02-11 13:20:27.000000000 +0100 -@@ -19,6 +19,7 @@ - * sng.cpp - SNG Player by Simon Peter - */ - -+#include - #include "sng.h" - - CPlayer *CsngPlayer::factory(Copl *newopl) diff --git a/adplug-2.1-gcc6.patch b/adplug-2.2.1-signed-char.patch similarity index 60% rename from adplug-2.1-gcc6.patch rename to adplug-2.2.1-signed-char.patch index 79dc342..ec3baf0 100644 --- a/adplug-2.1-gcc6.patch +++ b/adplug-2.2.1-signed-char.patch @@ -1,6 +1,6 @@ -diff -upr a/src/s3m.cpp b/src/s3m.cpp ---- a/src/s3m.cpp 2006-07-02 00:27:00.000000000 -0500 -+++ b/src/s3m.cpp 2016-03-07 23:20:56.039017533 -0600 +diff -ur adplug-2.2.1-orig/src/s3m.cpp adplug-2.2.1/src/s3m.cpp +--- adplug-2.2.1-orig/src/s3m.cpp 2016-06-12 17:19:33.369934280 +0200 ++++ adplug-2.2.1/src/s3m.cpp 2016-06-12 17:32:36.190932642 +0200 @@ -25,7 +25,7 @@ #include #include "s3m.h" @@ -10,9 +10,10 @@ diff -upr a/src/s3m.cpp b/src/s3m.cpp {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1}; const unsigned short Cs3mPlayer::notetable[12] = // S3M adlib note table ---- a/src/s3m.h 2006-05-13 00:36:42.000000000 -0500 -+++ b/src/s3m.h 2016-03-08 00:56:07.953972552 -0600 -@@ -90,7 +90,7 @@ class Cs3mPlayer: public CPlayer +diff -ur adplug-2.2.1-orig/src/s3m.h adplug-2.2.1/src/s3m.h +--- adplug-2.2.1-orig/src/s3m.h 2016-06-12 17:19:33.367934293 +0200 ++++ adplug-2.2.1/src/s3m.h 2016-06-12 17:37:14.538154102 +0200 +@@ -90,7 +90,7 @@ unsigned char crow,ord,speed,tempo,del,songend,loopstart,loopcnt; private: diff --git a/adplug.spec b/adplug.spec index a981ac2..8862733 100644 --- a/adplug.spec +++ b/adplug.spec @@ -10,6 +10,7 @@ URL: http://adplug.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz +Patch0: adplug-2.2.1-signed-char.patch License: LGPLv2+ BuildRequires: libbinio-devel >= 1.4 BuildRequires: pkgconfig @@ -44,6 +45,7 @@ This package contains development files for the AdPlug AdLib %prep %setup -q +%patch0 -p1 tar xvfz %{SOURCE1} # Include these by different name mv %{adplugdbver}/README README.adplugdb From 9811e85d63690adf96e6a43fb59dfbbe44ecfe9c Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 13 Jun 2016 11:10:37 +0200 Subject: [PATCH 31/65] AdPlug moved to github --- adplug.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 8862733..0fe8d6b 100644 --- a/adplug.spec +++ b/adplug.spec @@ -6,7 +6,7 @@ Name: adplug Version: 2.2.1 Release: 1%{?dist} Summary: A software library for AdLib (OPL2) emulation -URL: http://adplug.sourceforge.net/ +URL: http://adplug.github.io/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz From cb22654dc7ddb1510f3699471070dfa772cc1781 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:46:45 +0000 Subject: [PATCH 32/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 0fe8d6b..c961b6e 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Group: Applications/Multimedia @@ -101,6 +101,9 @@ fi %{_infodir}/*.gz %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Jun 12 2016 Linus Walleij - 2.2.1-1 - New upstream version - Run libtoolize, aclocal, automake and autoconf on build to avoid From acd6aa615f1573452e62813ad280e22116c14a8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:37:58 +0000 Subject: [PATCH 33/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index c961b6e..263dd5f 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Group: Applications/Multimedia @@ -101,6 +101,9 @@ fi %{_infodir}/*.gz %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From d8d32d754a931977e33f7e079dfe8b516e499456 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:25:07 +0000 Subject: [PATCH 34/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 263dd5f..ecff511 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Group: Applications/Multimedia @@ -101,6 +101,9 @@ fi %{_infodir}/*.gz %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From e67a9732f661e191856358fd265962fc730036fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:56:15 +0000 Subject: [PATCH 35/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index ecff511..879aabb 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Group: Applications/Multimedia @@ -101,6 +101,9 @@ fi %{_infodir}/*.gz %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 2.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From af63436465447f5e17b031090a40f9c50ebbae2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:01:51 +0000 Subject: [PATCH 36/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 879aabb..dff71fd 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Group: Applications/Multimedia @@ -101,6 +101,9 @@ fi %{_infodir}/*.gz %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c4c2e21deacd8df974483ad262fc124ff173271d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 25 Jul 2018 12:37:18 +0200 Subject: [PATCH 37/65] BR: gcc-c++ Signed-off-by: Igor Gnatenko --- adplug.spec | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/adplug.spec b/adplug.spec index dff71fd..82d34a6 100644 --- a/adplug.spec +++ b/adplug.spec @@ -12,6 +12,7 @@ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz Patch0: adplug-2.2.1-signed-char.patch License: LGPLv2+ +BuildRequires: gcc-c++ BuildRequires: libbinio-devel >= 1.4 BuildRequires: pkgconfig BuildRequires: texinfo @@ -36,8 +37,6 @@ Summary: Development files for AdPlug Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libbinio-devel -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info %description devel This package contains development files for the AdPlug AdLib @@ -72,17 +71,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir mkdir -p $RPM_BUILD_ROOT%{shareddata}/%{name} install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%post devel -/sbin/install-info %{_infodir}/libadplug.info.gz %{_infodir}/dir || : - -%preun devel -if [ $1 = 0 ]; then -/sbin/install-info --delete %{_infodir}/libadplug.info.gz %{_infodir}/dir || : -fi +%ldconfig_scriptlets %files %{_libdir}/*.so.* From e85cfee3b5c6657a12761677c96d1506683c925b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 15 Dec 2018 02:16:06 +0100 Subject: [PATCH 38/65] Fix double-free in CEmuopl::~CEmuopl() (#1635881, CVE-2018-17825) --- adplug-2.3.1-cve-2018-17825.patch | 25 +++++++++++++++++++++++++ adplug.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 adplug-2.3.1-cve-2018-17825.patch diff --git a/adplug-2.3.1-cve-2018-17825.patch b/adplug-2.3.1-cve-2018-17825.patch new file mode 100644 index 0000000..bbf7701 --- /dev/null +++ b/adplug-2.3.1-cve-2018-17825.patch @@ -0,0 +1,25 @@ +From 19ebb61bf92262dc1868de10ba5a211db249ce76 Mon Sep 17 00:00:00 2001 +From: Stas'M +Date: Thu, 4 Oct 2018 00:18:32 +0300 +Subject: [PATCH] FMOPL: Avoid double-free by checking OPL pointer (fix #67) + +Fixes CVE-2018-17825. +--- + src/fmopl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/fmopl.c b/src/fmopl.c +index 0cd1d69..1c4485e 100644 +--- a/src/fmopl.c ++++ b/src/fmopl.c +@@ -1269,6 +1269,10 @@ FM_OPL *OPLCreate(int type, int clock, int rate) + /* ---------- Destroy one of vietual YM3812 ---------- */ + void OPLDestroy(FM_OPL *OPL) + { ++ if(!OPL) ++ { ++ return; ++ } + #ifdef OPL_OUTPUT_LOG + if(opl_dbg_fp) + { diff --git a/adplug.spec b/adplug.spec index 82d34a6..f1d3fb4 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,13 +4,14 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz Patch0: adplug-2.2.1-signed-char.patch +Patch1: adplug-2.3.1-cve-2018-17825.patch License: LGPLv2+ BuildRequires: gcc-c++ BuildRequires: libbinio-devel >= 1.4 @@ -45,6 +46,7 @@ This package contains development files for the AdPlug AdLib %prep %setup -q %patch0 -p1 +%patch1 -p1 tar xvfz %{SOURCE1} # Include these by different name mv %{adplugdbver}/README README.adplugdb @@ -90,6 +92,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Sat Dec 15 2018 Robert Scheck - 2.2.1-7 +- Fix double-free in CEmuopl::~CEmuopl() (#1635881, CVE-2018-17825) + * Thu Jul 12 2018 Fedora Release Engineering - 2.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 13c9e5c88db121063b8360c349d867b578f3a95d Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 15 Dec 2018 02:16:40 +0100 Subject: [PATCH 39/65] Try to fix bogus date warnings in %changelog --- adplug.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adplug.spec b/adplug.spec index f1d3fb4..5b1cf0f 100644 --- a/adplug.spec +++ b/adplug.spec @@ -199,7 +199,7 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} the database actually. And it is obviously OK to create and own directories under /var/lib as opposed to /var. -* Thu Mar 31 2006 Linus Walleij 1.5.1-7.20060323cvs +* Thu Mar 30 2006 Linus Walleij 1.5.1-7.20060323cvs - Patching to move database from /var/adplug to just /var since FHS does not like creation of directories under /var. @@ -218,7 +218,7 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} - Fixed scriptlet problems under non-shell environments. - Make adplug-devel require libbinio-devel. -* Sun Jan 09 2006 Linus Walleij 1.5.1-2.20060101cvs +* Sun Jan 08 2006 Linus Walleij 1.5.1-2.20060101cvs - Did a clean-up rollercoaster ride. * Sun Jan 01 2006 Linus Walleij 1.5.1-1.20060101cvs From bce1e02d9ac7fe8aac330269f31e4d6c7b7f2e17 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 40/65] Remove obsolete Group tag Signed-off-by: Igor Gnatenko --- adplug.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/adplug.spec b/adplug.spec index 5b1cf0f..f084dbf 100644 --- a/adplug.spec +++ b/adplug.spec @@ -7,7 +7,6 @@ Version: 2.2.1 Release: 7%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ -Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz Patch0: adplug-2.2.1-signed-char.patch @@ -35,7 +34,6 @@ playback. It supports various audio formats from MS-DOS AdLib trackers. %package devel Summary: Development files for AdPlug -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libbinio-devel From 61209b8da32883fd38c2df732f6327a1fb597d2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:01:21 +0000 Subject: [PATCH 41/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index f084dbf..6739178 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -90,6 +90,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Dec 15 2018 Robert Scheck - 2.2.1-7 - Fix double-free in CEmuopl::~CEmuopl() (#1635881, CVE-2018-17825) From af330db2e9212d97f343309b699049a6021c9fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 24 Apr 2019 14:56:28 +0200 Subject: [PATCH 42/65] Remove hardcoded gzip suffix from GNU info pages --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 6739178..5b5b6eb 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -90,6 +90,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Wed Apr 24 2019 Björn Esser - 2.2.1-9 +- Remove hardcoded gzip suffix from GNU info pages + * Thu Jan 31 2019 Fedora Release Engineering - 2.2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From dc0507b1a581bba90b8d9219ef20be82cf4daa80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:37:11 +0000 Subject: [PATCH 43/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 5b5b6eb..462f04b 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -90,6 +90,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.2.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Apr 24 2019 Björn Esser - 2.2.1-9 - Remove hardcoded gzip suffix from GNU info pages From dc7aace7b956fd86d574f4b846b48fde8b959f3a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 31 Jul 2019 20:30:00 +0200 Subject: [PATCH 44/65] Avoid undefined reference to `OPL_CALC_RH' --- adplug-2.2.1-inline.patch | 17 +++++++++++++++++ adplug.spec | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 adplug-2.2.1-inline.patch diff --git a/adplug-2.2.1-inline.patch b/adplug-2.2.1-inline.patch new file mode 100644 index 0000000..aaf142b --- /dev/null +++ b/adplug-2.2.1-inline.patch @@ -0,0 +1,17 @@ +Patch by Robert Scheck for adplug >= 2.2.1, which +works around undefined reference linking error when using GCC >= 9.1 (while +it works with GCC 9.0.x and older): + +/usr/bin/ld: ../src/.libs/libadplug.so: undefined reference to `OPL_CALC_RH' + +--- adplug-2.2.1/src/fmopl.c 2003-11-03 16:41:33.000000000 +0100 ++++ adplug-2.2.1/src/fmopl.c.inline 2019-07-31 19:57:40.925132660 +0200 +@@ -31,7 +31,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#define INLINE __inline ++#define INLINE + #define HAS_YM3812 1 + + #include diff --git a/adplug.spec b/adplug.spec index 462f04b..9ca0712 100644 --- a/adplug.spec +++ b/adplug.spec @@ -11,6 +11,7 @@ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz Patch0: adplug-2.2.1-signed-char.patch Patch1: adplug-2.3.1-cve-2018-17825.patch +Patch2: adplug-2.2.1-inline.patch License: LGPLv2+ BuildRequires: gcc-c++ BuildRequires: libbinio-devel >= 1.4 @@ -45,6 +46,7 @@ This package contains development files for the AdPlug AdLib %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 tar xvfz %{SOURCE1} # Include these by different name mv %{adplugdbver}/README README.adplugdb From fd8568035bf0a46237202bcded0f86b85b61b2b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:16:35 +0000 Subject: [PATCH 45/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 9ca0712..5dbc14b 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -92,6 +92,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.2.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 2.2.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 31fb5982116eb5c3ee79b08cb157c0550f55cb73 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:47:51 +0000 Subject: [PATCH 46/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 5dbc14b..a8d439c 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -92,6 +92,9 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.2.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.2.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 21c334fb10e98082ad357e45e0cd9b2129b211c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:49:38 +0000 Subject: [PATCH 47/65] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index a8d439c..93e2df6 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.2.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A software library for AdLib (OPL2) emulation URL: http://adplug.github.io/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 @@ -92,6 +92,10 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_infodir}/*.gz %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 2.2.1-13 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.2.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0212d331dda115f233a26dd9cef6f063e7bb9dff Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:54:07 +0000 Subject: [PATCH 48/65] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- adplug.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/adplug.spec b/adplug.spec index 93e2df6..af20cfc 100644 --- a/adplug.spec +++ b/adplug.spec @@ -20,6 +20,7 @@ BuildRequires: texinfo BuildRequires: libtool BuildRequires: autoconf BuildRequires: automake +BuildRequires: make # This is to resolve the endless disputes of the shared data for this # package. Whenever _sharedstatedir contains something acceptable to # Fedora that can be used instead. From 843cf78ed4dadcf4ef9a4a441f88bf8ff0539157 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Tue, 5 Jan 2021 04:20:31 +0100 Subject: [PATCH 49/65] Upgrade to 2.3.3 (#1743108, #1770224, #1770243, #1770257, #1778710, #1778716, #1778720) --- .gitignore | 7 ++- adplug-2.2.1-inline.patch | 17 ------ adplug-2.2.1-signed-char.patch | 24 --------- adplug-2.3.1-cve-2018-17825.patch | 25 --------- adplug.spec | 90 +++++++++++++++---------------- sources | 4 +- 6 files changed, 50 insertions(+), 117 deletions(-) delete mode 100644 adplug-2.2.1-inline.patch delete mode 100644 adplug-2.2.1-signed-char.patch delete mode 100644 adplug-2.3.1-cve-2018-17825.patch diff --git a/.gitignore b/.gitignore index 6c8745f..b77bfd3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -adplug-2.1.tar.bz2 -adplugdb-2006-07-07.tar.gz -/adplug-2.2.1.tar.gz -/adplug-2.2.1.tar.bz2 +/adplug-*.tar.gz +/adplug-*.tar.bz2 +/adplugdb-*.tar.gz diff --git a/adplug-2.2.1-inline.patch b/adplug-2.2.1-inline.patch deleted file mode 100644 index aaf142b..0000000 --- a/adplug-2.2.1-inline.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch by Robert Scheck for adplug >= 2.2.1, which -works around undefined reference linking error when using GCC >= 9.1 (while -it works with GCC 9.0.x and older): - -/usr/bin/ld: ../src/.libs/libadplug.so: undefined reference to `OPL_CALC_RH' - ---- adplug-2.2.1/src/fmopl.c 2003-11-03 16:41:33.000000000 +0100 -+++ adplug-2.2.1/src/fmopl.c.inline 2019-07-31 19:57:40.925132660 +0200 -@@ -31,7 +31,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#define INLINE __inline -+#define INLINE - #define HAS_YM3812 1 - - #include diff --git a/adplug-2.2.1-signed-char.patch b/adplug-2.2.1-signed-char.patch deleted file mode 100644 index ec3baf0..0000000 --- a/adplug-2.2.1-signed-char.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur adplug-2.2.1-orig/src/s3m.cpp adplug-2.2.1/src/s3m.cpp ---- adplug-2.2.1-orig/src/s3m.cpp 2016-06-12 17:19:33.369934280 +0200 -+++ adplug-2.2.1/src/s3m.cpp 2016-06-12 17:32:36.190932642 +0200 -@@ -25,7 +25,7 @@ - #include - #include "s3m.h" - --const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion -+const signed char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1}; - - const unsigned short Cs3mPlayer::notetable[12] = // S3M adlib note table -diff -ur adplug-2.2.1-orig/src/s3m.h adplug-2.2.1/src/s3m.h ---- adplug-2.2.1-orig/src/s3m.h 2016-06-12 17:19:33.367934293 +0200 -+++ adplug-2.2.1/src/s3m.h 2016-06-12 17:37:14.538154102 +0200 -@@ -90,7 +90,7 @@ - unsigned char crow,ord,speed,tempo,del,songend,loopstart,loopcnt; - - private: -- static const char chnresolv[]; -+ static const signed char chnresolv[]; - static const unsigned short notetable[12]; - static const unsigned char vibratotab[32]; - diff --git a/adplug-2.3.1-cve-2018-17825.patch b/adplug-2.3.1-cve-2018-17825.patch deleted file mode 100644 index bbf7701..0000000 --- a/adplug-2.3.1-cve-2018-17825.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 19ebb61bf92262dc1868de10ba5a211db249ce76 Mon Sep 17 00:00:00 2001 -From: Stas'M -Date: Thu, 4 Oct 2018 00:18:32 +0300 -Subject: [PATCH] FMOPL: Avoid double-free by checking OPL pointer (fix #67) - -Fixes CVE-2018-17825. ---- - src/fmopl.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/fmopl.c b/src/fmopl.c -index 0cd1d69..1c4485e 100644 ---- a/src/fmopl.c -+++ b/src/fmopl.c -@@ -1269,6 +1269,10 @@ FM_OPL *OPLCreate(int type, int clock, int rate) - /* ---------- Destroy one of vietual YM3812 ---------- */ - void OPLDestroy(FM_OPL *OPL) - { -+ if(!OPL) -+ { -+ return; -+ } - #ifdef OPL_OUTPUT_LOG - if(opl_dbg_fp) - { diff --git a/adplug.spec b/adplug.spec index af20cfc..d93d3bb 100644 --- a/adplug.spec +++ b/adplug.spec @@ -2,25 +2,19 @@ # RPM repository. %define adplugdbver 2006-07-07 -Name: adplug -Version: 2.2.1 -Release: 13%{?dist} -Summary: A software library for AdLib (OPL2) emulation -URL: http://adplug.github.io/ -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Source1: http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz -Patch0: adplug-2.2.1-signed-char.patch -Patch1: adplug-2.3.1-cve-2018-17825.patch -Patch2: adplug-2.2.1-inline.patch +Name: adplug +Version: 2.3.3 +Release: 1%{?dist} +Summary: Software library for AdLib (OPL2/3) emulation +URL: https://adplug.github.io/ +Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 +Source1: https://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz License: LGPLv2+ BuildRequires: gcc-c++ -BuildRequires: libbinio-devel >= 1.4 -BuildRequires: pkgconfig -BuildRequires: texinfo -BuildRequires: libtool -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: make +BuildRequires: make +BuildRequires: libbinio-devel >= 1.4 +BuildRequires: pkgconfig +BuildRequires: texinfo # This is to resolve the endless disputes of the shared data for this # package. Whenever _sharedstatedir contains something acceptable to # Fedora that can be used instead. @@ -28,61 +22,63 @@ BuildRequires: make %description AdPlug is a free software, cross-platform, hardware independent AdLib -sound player library, mainly written in C++ and released under the -LGPL. AdPlug plays sound data, originally created for the AdLib (OPL2) -audio board, directly from its original format on top of an OPL2 -emulator or by using the real hardware. No OPL chip is required for -playback. It supports various audio formats from MS-DOS AdLib trackers. +sound player library, mainly written in C++. AdPlug plays sound data, +originally created for the AdLib (OPL2/3) audio board, directly from +its original format on top of an OPL2/3 emulator or by using the real +hardware. No OPL2/3 chips are required for playback. %package devel Summary: Development files for AdPlug Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libbinio-devel +Requires: libbinio-devel +%if 0%{?rhel} && 0%{?rhel} <= 7 +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info +%endif %description devel -This package contains development files for the AdPlug AdLib -(OPL2) emulator. +This package contains development files for the AdPlug AdLib (OPL2/3) +emulator. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 tar xvfz %{SOURCE1} # Include these by different name mv %{adplugdbver}/README README.adplugdb mv %{adplugdbver}/NEWS NEWS.adplugdb %build -rm -f ltmain.sh config.guess config.sub -libtoolize --copy --force || fail -rm -f aclocal.m4 -aclocal $ACLOCAL_FLAGS || fail -rm -f depcomp install-sh missing -touch config.rpath -automake --add-missing --gnu || fail -rm -f configure -autoconf -%configure --disable-static --sharedstatedir=%{shareddata} --disable-rpath -make %{?_smp_mflags} +%configure --disable-static --sharedstatedir=%{shareddata} +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%make_build %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%make_install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_infodir}/dir -mkdir -p $RPM_BUILD_ROOT%{shareddata}/%{name} -install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} +install -D -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name}/adplug.db %ldconfig_scriptlets +%if 0%{?rhel} && 0%{?rhel} <= 7 +%post devel +/sbin/install-info %{_infodir}/libadplug.info.gz %{_infodir}/dir || : + +%preun devel +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/libadplug.info.gz %{_infodir}/dir || : +fi +%endif + %files %{_libdir}/*.so.* %dir %{shareddata}/%{name}/ %config(noreplace) %{shareddata}/%{name}/adplug.db %{_bindir}/adplugdb %{_mandir}/man1/adplugdb.1* -%doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO +%license COPYING +%doc AUTHORS BUGS ChangeLog NEWS README %doc NEWS.adplugdb README.adplugdb %files devel @@ -90,9 +86,13 @@ install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name} %{_libdir}/pkgconfig/*.pc %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h -%{_infodir}/*.gz +%{_infodir}/libadplug.info* %changelog +* Tue Jan 05 2021 Robert Scheck - 2.3.3-1 +- Upgrade to 2.3.3 (#1743108, #1770224, #1770243, #1770257, + #1778710, #1778716, #1778720) + * Fri Jul 31 2020 Fedora Release Engineering - 2.2.1-13 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 3a8cf58..1a2ad47 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8f815fd5d254de0fe5df818df9d1d8af adplug-2.2.1.tar.bz2 -40a1cc1222c7318172ee3740c4269df3 adplugdb-2006-07-07.tar.gz +SHA512 (adplug-2.3.3.tar.bz2) = 08647c746df69aa0a3941ee64d3adecd11a46febf51fe1bb9fe16ff01a6fef56321b18618f5ecb66309b8cdac8493a067707759fbdf0e91d556677c6b4c57a44 +SHA512 (adplugdb-2006-07-07.tar.gz) = c3391ac83b8433a94f036affd8618f1202499890056b9799854f66806b76a4ededc61b41ea7548bbe50e545fc5c7e33754c4e15bb940d34b7135cc9b5f129501 From 7f591a4d87d26a4717fe8c0c26fa965c43772833 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:51:26 +0000 Subject: [PATCH 50/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index d93d3bb..9c39156 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jan 05 2021 Robert Scheck - 2.3.3-1 - Upgrade to 2.3.3 (#1743108, #1770224, #1770243, #1770257, #1778710, #1778716, #1778720) From fb6956f58ebc34ef57526b6a9e9509f0b51df4b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:23:34 +0000 Subject: [PATCH 51/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 815d0f3fffefb7a611bd867a0751eda09a2ecc38 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:18:50 +0000 Subject: [PATCH 52/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 9c39156..954e539 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 2.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 7b7a355a4cad4417c84d3b44a21dda38f34b907a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:59:04 +0000 Subject: [PATCH 53/65] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 954e539..dc450ce 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 17d6fdb5b4e415ca5982af4d0ef8d255bc79e100 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:30:02 +0000 Subject: [PATCH 54/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index dc450ce..240b246 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.3.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ed8e53b9f4d5c3d231e56124e71dbb9b6e33ad05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:27:21 +0000 Subject: [PATCH 55/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 240b246..882ab08 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.3.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 2.3.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 3a5c96bed050c39af25a54f7c398319f2d5013b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:58:03 +0000 Subject: [PATCH 56/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 882ab08..dd31db2 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 2.3.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2a0338b743dc09e5d24c06e5ee3f5909ebf52b5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:17:56 +0000 Subject: [PATCH 57/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index dd31db2..46a4621 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.3.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.3.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ea12a0e48c4b1f13bbdad9813f0960f71a9a54a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:43:38 +0000 Subject: [PATCH 58/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 46a4621..548e153 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.3.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.3.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 076e95ac6776e16595ee9a2ed6be69b55ccae280 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:39:42 +0000 Subject: [PATCH 59/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 548e153..06be505 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -89,6 +89,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.3.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2.3.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0a2d2504e1e77a97b1682968dbb580ddcb93afbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 07:47:06 +0200 Subject: [PATCH 60/65] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- adplug.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/adplug.spec b/adplug.spec index 06be505..58015dc 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,12 +4,13 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 Source1: https://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libbinio-devel >= 1.4 @@ -89,6 +90,9 @@ fi %{_infodir}/libadplug.info* %changelog +* Wed Aug 28 2024 Miroslav Suchý - 2.3.3-11 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 2.3.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a5dfe1ad99375943d4881ed51bf5ea43678dc629 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 10 Nov 2024 13:43:45 +0100 Subject: [PATCH 61/65] Remove EPEL 7 build-time support --- adplug.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/adplug.spec b/adplug.spec index 58015dc..56ae909 100644 --- a/adplug.spec +++ b/adplug.spec @@ -32,10 +32,6 @@ hardware. No OPL2/3 chips are required for playback. Summary: Development files for AdPlug Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libbinio-devel -%if 0%{?rhel} && 0%{?rhel} <= 7 -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%endif %description devel This package contains development files for the AdPlug AdLib (OPL2/3) @@ -62,16 +58,6 @@ install -D -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{nam %ldconfig_scriptlets -%if 0%{?rhel} && 0%{?rhel} <= 7 -%post devel -/sbin/install-info %{_infodir}/libadplug.info.gz %{_infodir}/dir || : - -%preun devel -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/libadplug.info.gz %{_infodir}/dir || : -fi -%endif - %files %{_libdir}/*.so.* %dir %{shareddata}/%{name}/ From 6af33d289fc4adbf5abdc55c5088c6b893e8665c Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 10 Nov 2024 14:02:34 +0100 Subject: [PATCH 62/65] Reviewed automatically converted license tag --- adplug.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adplug.spec b/adplug.spec index 56ae909..af3d10c 100644 --- a/adplug.spec +++ b/adplug.spec @@ -9,8 +9,7 @@ Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 Source1: https://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz -# Automatically converted from old format: LGPLv2+ - review is highly recommended. -License: LicenseRef-Callaway-LGPLv2+ +License: LGPL-2.1-or-later AND GFDL-1.1-or-later BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libbinio-devel >= 1.4 From 2eeb9bbfe770218473d73f1087bfc313e7282569 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:39:25 +0000 Subject: [PATCH 63/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index af3d10c..9103e96 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -75,6 +75,9 @@ install -D -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{nam %{_infodir}/libadplug.info* %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.3.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 28 2024 Miroslav Suchý - 2.3.3-11 - convert license to SPDX From 1c80d83e8e80b38a4a86dd070062686ec9b02ca0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:47:36 +0000 Subject: [PATCH 64/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 9103e96..127c27f 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -75,6 +75,9 @@ install -D -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{nam %{_infodir}/libadplug.info* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.3.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 2.3.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b7653a45a245474056b4f4167e90ed8bea3dbaa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:28:55 +0000 Subject: [PATCH 65/65] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- adplug.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adplug.spec b/adplug.spec index 127c27f..337ea08 100644 --- a/adplug.spec +++ b/adplug.spec @@ -4,7 +4,7 @@ %define adplugdbver 2006-07-07 Name: adplug Version: 2.3.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Software library for AdLib (OPL2/3) emulation URL: https://adplug.github.io/ Source0: https://github.com/adplug/adplug/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 @@ -75,6 +75,9 @@ install -D -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{nam %{_infodir}/libadplug.info* %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.3.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 2.3.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild