From 2eeef5e3cbb1110aedf8af3f9a6a643723361f9fe958a268feceac4362a693f1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 20 Feb 2020 16:06:35 +0000 Subject: [PATCH 1/3] SDL_bgi-2.4.0 OBS-URL: https://build.opensuse.org/package/show/graphics/SDL_bgi?expand=0&rev=43 --- SDL_bgi-2.3.1.tar.gz | 3 --- SDL_bgi-2.4.0.tar.gz | 3 +++ SDL_bgi-rpmlintrc | 2 ++ SDL_bgi.changes | 12 +++++++++ SDL_bgi.spec | 38 +++++++++----------------- sdlbgi-automake.diff | 64 -------------------------------------------- sdlbgi-cmake.diff | 32 ++++++++++++++++++++++ 7 files changed, 62 insertions(+), 92 deletions(-) delete mode 100644 SDL_bgi-2.3.1.tar.gz create mode 100644 SDL_bgi-2.4.0.tar.gz create mode 100644 SDL_bgi-rpmlintrc delete mode 100644 sdlbgi-automake.diff create mode 100644 sdlbgi-cmake.diff diff --git a/SDL_bgi-2.3.1.tar.gz b/SDL_bgi-2.3.1.tar.gz deleted file mode 100644 index e40040f..0000000 --- a/SDL_bgi-2.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9125854a894924d1292bad2da52ee991ce238f24417ec9cff770b45e7cf54ea -size 1343418 diff --git a/SDL_bgi-2.4.0.tar.gz b/SDL_bgi-2.4.0.tar.gz new file mode 100644 index 0000000..a87bda0 --- /dev/null +++ b/SDL_bgi-2.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fcdc9ec49b583412fee5825ca6446cc28a1bc61045bf9732db138e92bb9561b8 +size 1396648 diff --git a/SDL_bgi-rpmlintrc b/SDL_bgi-rpmlintrc new file mode 100644 index 0000000..49f1cb0 --- /dev/null +++ b/SDL_bgi-rpmlintrc @@ -0,0 +1,2 @@ +# Go home rpmlint, you are drunk. libSDL_bgisuse3 is not the right name. +addFilter("shlib-policy-name-error") diff --git a/SDL_bgi.changes b/SDL_bgi.changes index ad8c964..49eaffa 100644 --- a/SDL_bgi.changes +++ b/SDL_bgi.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Feb 20 15:46:54 UTC 2020 - Jan Engelhardt + +- Update to release 2.4.0 + * Hershey font support as a replacement for the original + Borland .chr fonts. + * If the SDL_BGI_RES environment variable is set to "VGA", + initgraph (DETECT, ...) forces VGA (640x480) resolution. + * Added getlinebuffer() and putlinebuffer() + * Changed 8x8 bitmap font using the one from the DosBox emulator. +- Drop sdlbgi-automake.diff, add sdlbgi-cmake.diff. + ------------------------------------------------------------------- Wed Jan 22 17:32:44 UTC 2020 - Jan Engelhardt diff --git a/SDL_bgi.spec b/SDL_bgi.spec index 5cc0d48..e40880d 100644 --- a/SDL_bgi.spec +++ b/SDL_bgi.spec @@ -17,8 +17,8 @@ Name: SDL_bgi -%define lname libSDL_bgi2 -Version: 2.3.1 +%define lname libSDL_bgi-suse3 +Version: 2.4.0 Release: 0 Summary: BGI-compatible 2D graphics C library with SDL backend License: Zlib AND GPL-2.0-or-later @@ -26,9 +26,9 @@ Group: Development/Libraries/X11 URL: http://libXbgi.sf.net/ Source: http://downloads.sf.net/libxbgi/%name-%version.tar.gz -Patch1: sdlbgi-automake.diff -BuildRequires: automake >= 1.11 -BuildRequires: libtool >= 2 +Source9: %name-rpmlintrc +Patch1: sdlbgi-cmake.diff +BuildRequires: cmake BuildRequires: pkg-config BuildRequires: pkgconfig(sdl2) @@ -65,37 +65,25 @@ together. %patch -P 1 -p1 %build -autoreconf -fi -%configure --disable-static -make %{?_smp_mflags} +%cmake +%make_build %install -%make_install +%cmake_install b="%buildroot" -rm -f "$b/%_libdir"/*.la -mkdir -p "$b/%_includedir/SDL_bgi" "$b/%_libdir/pkgconfig" -ln -s "../SDL2/SDL_bgi.h" "$b/%_includedir/SDL_bgi/graphics.h" -install -pm0644 test/dos.h test/conio.h "$b/%_includedir/SDL_bgi/" -cat >"$b/%_libdir/pkgconfig/SDL_bgi.pc" <<-EOF - Name: SDL_bgi - Description: BGI-compatible API with SDL backend - Version: %version - Requires: sdl SDL_gfx - Libs: -lSDL_bgi -EOF +mkdir -p "$b/%_defaultdocdir" +mv "$b/%_datadir/doc/%name" "$b/%_defaultdocdir/" %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname %doc LICENSE -%_libdir/libSDL_bgi.so.2* +%_libdir/libSDL_bgi.so.suse3 %files -n libSDL_bgi-devel -%doc README.md doc/* -%_includedir/SDL2/ -%_includedir/SDL_bgi/ +%_defaultdocdir/%name/ +%_includedir/* %_libdir/libSDL_bgi.so -%_libdir/pkgconfig/SDL_bgi.pc %changelog diff --git a/sdlbgi-automake.diff b/sdlbgi-automake.diff deleted file mode 100644 index 76a0266..0000000 --- a/sdlbgi-automake.diff +++ /dev/null @@ -1,64 +0,0 @@ -From: Jan Engelhardt -Date: 2014-12-18 11:43:21.385084191 +0100 -Refresh: Wed Dec 2 14:19:14 CET 2015 - -Author could not decide between "sdlbgifast" and "bgifast" -(same for bgislow), so add extra symbols to enable both names. - ---- - Makefile.am | 2 ++ - configure.ac | 9 +++++++++ - src/Makefile.am | 8 ++++++++ - test/Makefile.am | 11 +++++++++++ - 4 files changed, 30 insertions(+) - -Index: SDL_bgi-2.2.2/Makefile.am -=================================================================== ---- /dev/null -+++ SDL_bgi-2.2.2/Makefile.am -@@ -0,0 +1,2 @@ -+ACLOCAL_AMFLAGS = -I m4 -+SUBDIRS = src test -Index: SDL_bgi-2.2.2/configure.ac -=================================================================== ---- /dev/null -+++ SDL_bgi-2.2.2/configure.ac -@@ -0,0 +1,9 @@ -+AC_INIT([SDL_bgi], [2.3.0]) -+AC_CONFIG_AUX_DIR([build-aux]) -+AC_CONFIG_MACRO_DIR([m4]) -+AC_PROG_CC -+AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax dist-xz no-dist-gzip]) -+LT_INIT -+PKG_CHECK_MODULES([sdl2], [sdl2]) -+AC_CONFIG_FILES([Makefile src/Makefile test/Makefile]) -+AC_OUTPUT -Index: SDL_bgi-2.2.2/src/Makefile.am -=================================================================== ---- /dev/null -+++ SDL_bgi-2.2.2/src/Makefile.am -@@ -0,0 +1,8 @@ -+AM_CPPFLAGS = ${sdl2_CFLAGS} -+AM_CFLAGS = -Wall -+lib_LTLIBRARIES = libSDL_bgi.la -+libSDL_bgi_la_SOURCES = SDL_bgi.c -+libSDL_bgi_la_LIBADD = -lm ${sdl2_LIBS} -+libSDL_bgi_la_LDFLAGS = -no-undefined -version-info 2:0:0 -+pkgincludedir = ${includedir}/SDL2 -+pkginclude_HEADERS = SDL_bgi.h -Index: SDL_bgi-2.2.2/test/Makefile.am -=================================================================== ---- /dev/null -+++ SDL_bgi-2.2.2/test/Makefile.am -@@ -0,0 +1,11 @@ -+AM_CPPFLAGS = -I${top_srcdir}/src -+AM_CFLAGS = -Wall -+EXTRA_PROGRAMS = \ -+ cellular dla fern floodfilltest hopalong kaleido life \ -+ mandelbrot mousetest moveit plasma sdlbgidemo simple turtledemo -+LDADD = ../src/libSDL_bgi.la -+hopalong_LDADD = ${LDADD} -lm -+plasma_LDADD = ${LDADD} -lm -+sdlbgidemo_LDADD = ${LDADD} -lm -+turtledemo_SOURCES = turtle.c turtledemo.c -+turtledemo_LDADD = ${LDADD} -lm diff --git a/sdlbgi-cmake.diff b/sdlbgi-cmake.diff new file mode 100644 index 0000000..fee76a9 --- /dev/null +++ b/sdlbgi-cmake.diff @@ -0,0 +1,32 @@ + +Fix stupid build strategy. + +And add some library versioning. + +--- + CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +Index: SDL_bgi-2.4.0/CMakeLists.txt +=================================================================== +--- SDL_bgi-2.4.0.orig/CMakeLists.txt ++++ SDL_bgi-2.4.0/CMakeLists.txt +@@ -20,9 +20,6 @@ include_directories (SDL2Test ${SDL2_INC + # Default install directory variables + include (GNUInstallDirs) + +-# fix stupid bug on Linux +-string (STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES) +- + # Find source files + file (GLOB SOURCES src/*.c) + +@@ -31,6 +28,8 @@ include_directories (src) + + # Create shared library + add_library (${PROJECT_NAME} SHARED ${SOURCES}) ++set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION suse3) ++target_link_libraries(${PROJECT_NAME} -lm ${SDL2_LIBRARIES}) + + # Install library + install (TARGETS ${PROJECT_NAME} From 94a4b0e45ddd0b3ea8d4cb9caf763802831e180da457acfc5f828bcf40abcb20 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 20 Feb 2020 16:06:55 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/graphics/SDL_bgi?expand=0&rev=44 --- SDL_bgi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDL_bgi.spec b/SDL_bgi.spec index e40880d..8f397d3 100644 --- a/SDL_bgi.spec +++ b/SDL_bgi.spec @@ -78,7 +78,7 @@ mv "$b/%_datadir/doc/%name" "$b/%_defaultdocdir/" %postun -n %lname -p /sbin/ldconfig %files -n %lname -%doc LICENSE +%license LICENSE %_libdir/libSDL_bgi.so.suse3 %files -n libSDL_bgi-devel From b38e50882b947db81e79f73e6906482dc9f2265435fa71c229c8e7e8da20404a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 23 May 2020 14:47:40 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/graphics/SDL_bgi?expand=0&rev=45 --- SDL_bgi.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SDL_bgi.spec b/SDL_bgi.spec index 8f397d3..1c76f16 100644 --- a/SDL_bgi.spec +++ b/SDL_bgi.spec @@ -25,6 +25,7 @@ License: Zlib AND GPL-2.0-or-later Group: Development/Libraries/X11 URL: http://libXbgi.sf.net/ +#Git-Web: https://github.com/genpfault/sdl-bgi Source: http://downloads.sf.net/libxbgi/%name-%version.tar.gz Source9: %name-rpmlintrc Patch1: sdlbgi-cmake.diff @@ -61,8 +62,7 @@ introduction to SDL-based graphics: SDL and BGI commands can be mixed together. %prep -%setup -q -%patch -P 1 -p1 +%autosetup -p1 %build %cmake @@ -73,6 +73,8 @@ together. b="%buildroot" mkdir -p "$b/%_defaultdocdir" mv "$b/%_datadir/doc/%name" "$b/%_defaultdocdir/" +# just a forwarder and conflicts with xbgi +rm -v "%buildroot/%_includedir/graphics.h" %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig