[packages/asap] - updated to 8.0.0
qboosh
qboosh at pld-linux.org
Wed Apr 8 22:29:46 CEST 2026
commit f45bb8897a1dd4e96baef679eb7f4c4e146a408b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Apr 8 22:30:12 2026 +0200
- updated to 8.0.0
asap-make.patch | 88 +++++++++++++++++++++++++--------------------------------
asap.spec | 34 ++++++++++++++--------
2 files changed, 61 insertions(+), 61 deletions(-)
---
diff --git a/asap.spec b/asap.spec
index 6151452..27f84f0 100644
--- a/asap.spec
+++ b/asap.spec
@@ -1,16 +1,21 @@
-# TODO: plugins, bindings?
+# TODO: plugins (xmms, xmms2, vlc), bindings (python, java)?
+#
+# Conditional build:
+%bcond_with www # WWW docs with JavaScript player (TODO: package)
+
Summary: ASAP - Another Slight Atari Player
Summary(pl.UTF-8): ASAP (Another Slight Atari Player) - jeszcze jeden odtwarzacz plików z Atari
Name: asap
-Version: 3.1.3
+Version: 8.0.0
Release: 1
License: GPL v2+
Group: Applications/Sound
-Source0: http://downloads.sourceforge.net/asap/%{name}-%{version}.tar.gz
-# Source0-md5: ce136b58933a67154e43902fcf239d58
+Source0: https://downloads.sourceforge.net/asap/%{name}-%{version}.tar.gz
+# Source0-md5: 34d2f16bc07727792c197461188f4176
Patch0: %{name}-make.patch
-URL: http://asap.sourceforge.net/
+URL: https://asap.sourceforge.net/
BuildRequires: SDL-devel
+%{?with_www:BuildRequires: fut}
BuildRequires: libtool
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -19,7 +24,8 @@ ASAP is a player of Atari 8-bit music for modern computers and mobile
devices. It emulates the POKEY sound chip and the 6502 processor.
ASAP supports the following file formats: SAP, CMC, CM3, CMR, CMS,
-DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2, FC.
+DMC, DLT, FC, MPT, MPD, MD1+D15, MD1+D8, MD2+D8, RMT, TMC/TM8, TM2,
+STIL.
The main package contains ASAP shared library and converter.
@@ -29,7 +35,8 @@ komputerów i urządzeń przenośnych. Emuluje układ dźwiękowy POKEY i
procesor 6502.
ASAP obsługuje następujące formaty plików: SAP, CMC, CM3, CMR, CMS,
-DMC, DLT, MPT, MPD, RMT, TMC, TM8, TM2, FC.
+DMC, DLT, FC, MPT, MPD, MD1+D15, MD1+D8, MD2+D8, RMT, TMC/TM8, TM2,
+STIL.
Główny pakiet zawiera bibliotekę współdzieloną i konwerter.
@@ -81,6 +88,11 @@ Odtwarzacz ASAP oparty na SDL.
LDFLAGS="%{rpmldflags}" \
libdir=%{_libdir}
+%if %{with www}
+%{__make} www \
+ V=1
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -97,14 +109,14 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CREDITS NEWS README.html USAGE-WEB sap-format.txt
+%doc README
%attr(755,root,root) %{_bindir}/asapconv
-%attr(755,root,root) %{_libdir}/libasap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libasap.so.0
+%{_libdir}/libasap.so.*.*.*
+%ghost %{_libdir}/libasap.so.0
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libasap.so
+%{_libdir}/libasap.so
%{_includedir}/asap.h
%files static
diff --git a/asap-make.patch b/asap-make.patch
index 104aad6..af03fb5 100644
--- a/asap-make.patch
+++ b/asap-make.patch
@@ -1,27 +1,24 @@
---- asap-3.1.3/Makefile.orig 2012-09-08 11:07:08.000000000 +0200
-+++ asap-3.1.3/Makefile 2013-04-13 07:42:52.750361640 +0200
-@@ -1,11 +1,18 @@
- prefix := /usr/local
-+libdir := $(prefix)/lib
- srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
--CC = $(DO)gcc -s -O2 -Wall -o $@ $(if $(filter %.so,$@),-shared -fPIC) $(INCLUDEOPTS) $(filter %.c,$^)
--AR = $(DO)ar rc $@ $^
-+CC=gcc
-+CFLAGS="-O2 -Wall"
-+LDFLAGS="-s"
-+LIBTOOL=libtool
-+COMPLINK = $(DO)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(if $(filter %.so,$@),-shared -fPIC) $(INCLUDEOPTS) $(CPPFLAGS) $(filter %.c,$^)
+--- asap-6.0.3/Makefile.orig 2024-03-01 09:17:06.000000000 +0100
++++ asap-6.0.3/Makefile 2024-12-01 21:15:08.501574754 +0100
+@@ -8,12 +8,16 @@ CPPFLAGS =
+ LDFLAGS = -s
+ AR = ar
+ ARFLAGS = rc
+-DO_CC = $(DO)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(if $(filter %.so,$@),-shared -fPIC) $(INCLUDEOPTS) $(filter %.c,$^) $(LDFLAGS) -lm
++LIBTOOL = libtool
++DO_CC = $(DO)$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -o $@ $(if $(filter %.so,$@),-shared -fPIC) $(INCLUDEOPTS) $(filter %.c,$^) -lm
+ DO_AR = $(DO)$(AR) $(ARFLAGS) $@ $^
+LTCOMPILE = $(DO)$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CFLAGS) -o $@ $(INCLUDEOPTS) $(CPPFLAGS) $(filter %.c,$^)
+LIBLINK = $(DO)$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ -rpath $(libdir)
- CITO = $(DO)cito.exe -o $@ $(patsubst %,-I %,$(sort $(dir $(filter-out %.ci,$^)))) $(filter %.ci,$^)
+ FUT = $(DO)fut -o $@ $(patsubst %,-I %,$(sort $(dir $(filter-out %.fu,$^)))) $(filter %.fu,$^)
INSTALL = install
- INSTALL_PROGRAM = mkdir -p $(DESTDIR)$(2) && $(INSTALL) $(1) $(DESTDIR)$(2)/$(1)
+ INSTALL_PROGRAM = mkdir -p $(DESTDIR)$(2) && $(INSTALL) $(1) $(DESTDIR)$(2)/$(or $(3),$(1))
INSTALL_DATA = mkdir -p $(DESTDIR)$(2) && $(INSTALL) -m 644 $(1) $(DESTDIR)$(2)/$(1)
+LTINSTALL = mkdir -p $(DESTDIR)$(2) && $(LIBTOOL) --mode=install $(INSTALL) $(1) $(DESTDIR)$(2)/$(1)
- ASCIIDOC = $(DO)asciidoc -o - $(1) $< | sed -e "s/527bbd;/c02020;/" | xmllint --valid --nonet -o $@ -
SDL_CFLAGS = `sdl-config --cflags`
SDL_LIBS = `sdl-config --libs`
-@@ -27,7 +34,7 @@
+ SEVENZIP = 'C:/Program Files/7-Zip/7z' a -mx=9 -bd -bso0
+@@ -35,7 +39,7 @@ INCLUDEOPTS = $(patsubst %/,-I%,$(sort $
CLEAN :=
CLEANDIR :=
@@ -30,16 +27,7 @@
.PHONY: all
install: install-asapconv install-lib
-@@ -41,7 +48,7 @@
- # asapconv
-
- asapconv: $(call src,asapconv.c asap.[ch])
-- $(CC)
-+ $(COMPLINK)
- CLEAN += asapconv
-
- install-asapconv: asapconv
-@@ -54,20 +61,20 @@
+@@ -62,20 +66,20 @@ uninstall-asapconv:
# lib
@@ -48,43 +36,43 @@
.PHONY: lib
-libasap.a: asap.o
-- $(AR)
+- $(DO_AR)
-CLEAN += libasap.a
--
--asap.o: $(call src,asap.[ch])
-- $(CC) -c
--CLEAN += asap.o
+libasap.la: asap.lo
-+ $(LIBLINK)
++ $(LIBLINK) -lm
+CLEAN += libasap.la
-+
+
+-asap.o: $(call src,asap.[ch])
+- $(DO_CC) -c
+asap.lo: $(call src,asap.[ch])
+ $(LTCOMPILE)
-+CLEAN += asap.lo
+ CLEAN += asap.o
-install-lib: libasap.a $(srcdir)asap.h
+install-lib: libasap.la $(srcdir)asap.h
$(call INSTALL_DATA,$(srcdir)asap.h,$(prefix)/include)
-- $(call INSTALL_DATA,libasap.a,$(prefix)/lib)
+- $(call INSTALL_DATA,libasap.a,$(libdir))
+ $(call LTINSTALL,libasap.la,$(libdir))
.PHONY: install-lib
uninstall-lib:
-@@ -77,7 +84,7 @@
- # SDL
+--- asap-6.0.3/www/www.mk.orig 2024-03-01 09:16:50.000000000 +0100
++++ asap-6.0.3/www/www.mk 2024-12-02 06:31:59.447238790 +0100
+@@ -4,7 +4,7 @@ endif
- asap-sdl: $(call src,asap-sdl.c asap.[ch])
-- $(CC) $(SDL_CFLAGS) $(SDL_LIBS)
-+ $(COMPLINK) $(SDL_CFLAGS) $(SDL_LIBS)
- CLEAN += asap-sdl
+ WWW_TARGETS = www/index.html www/android.html www/windows.html www/macos.html www/linux.html \
+ www/web.html www/formats.html www/convert.html www/news.html www/sap-format.html www/contact.html \
+- www/apokeysnd.dll www/asap.js www/asapweb.js \
++ www/asap.js www/asapweb.js \
+ www/favicon.ico www/PORTS.xml www/PORTS.xsl
+ CLEAN += $(WWW_TARGETS)
- install-sdl: asap-sdl
-@@ -91,7 +98,7 @@
- # asapscan
+@@ -12,7 +12,7 @@ www: $(WWW_TARGETS)
+ .PHONY: www
- asapscan: $(srcdir)asapscan.c asap-asapscan.h
-- $(CC)
-+ $(COMPLINK)
- CLEAN += asapscan asapscan.exe
+ www/%.html: $(call src,www/www.xsl www/%.xml)
+- $(DO)xsltproc -o $@ --stringparam version $(VERSION) $^ && java -jar C:/bin/vnu.jar $@
++ $(DO)xsltproc -o $@ --stringparam version $(VERSION) $^
- asap-asapscan.h: $(call src,asap.ci asap6502.ci asapinfo.ci cpu6502.ci pokey.ci) $(ASM6502_PLAYERS_OBX) | asap-asapscan.c
+ www/apokeysnd.dll: win32/apokeysnd.dll
+ $(COPY)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/asap.git/commitdiff/f45bb8897a1dd4e96baef679eb7f4c4e146a408b
More information about the pld-cvs-commit
mailing list