diff --git a/SDL_bgi-1.0.1.tar.gz b/SDL_bgi-1.0.1.tar.gz deleted file mode 100644 index 69a275e..0000000 --- a/SDL_bgi-1.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1feb2037add2956617556aa53c84c60e65f69a3598a8ea247d7bc567d1e0a15f -size 55852 diff --git a/SDL_bgi-2.0.0.tar.gz b/SDL_bgi-2.0.0.tar.gz new file mode 100644 index 0000000..0ef6e39 --- /dev/null +++ b/SDL_bgi-2.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d8dc51d3fb42368f416a399389670f82ff08533a2a798f1b82d1dfd84f94e82 +size 230625 diff --git a/SDL_bgi.changes b/SDL_bgi.changes index b50f8b4..316afba 100644 --- a/SDL_bgi.changes +++ b/SDL_bgi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 7 11:24:57 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 2.0.0 +* This uses SDL2 as backend + ------------------------------------------------------------------- Thu Dec 18 09:25:45 UTC 2014 - jengelh@inai.de diff --git a/SDL_bgi.spec b/SDL_bgi.spec index 9404bba..b2b6482 100644 --- a/SDL_bgi.spec +++ b/SDL_bgi.spec @@ -18,10 +18,10 @@ Name: SDL_bgi %define lname libSDL_bgi0 -Version: 1.0.1 +Version: 2.0.0 Release: 0 Summary: BGI-compatible 2D graphics C library with SDL backend -License: BSD-3-Clause +License: Zlib and GPL-2.0+ Group: Development/Libraries/X11 Url: http://libXbgi.sf.net/ @@ -30,7 +30,7 @@ Patch1: sdlbgi-automake.diff BuildRequires: automake >= 1.11 BuildRequires: libtool >= 2 BuildRequires: pkg-config -BuildRequires: pkgconfig(SDL_gfx) +BuildRequires: pkgconfig(sdl2) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,8 +94,8 @@ EOF %files -n libSDL_bgi-devel %defattr(-,root,root) -%doc *.txt -%_includedir/*.h +%doc 00_README doc/* +%_includedir/SDL2/ %_libdir/libSDL_bgi.so %_libdir/pkgconfig/SDL_bgi.pc diff --git a/sdlbgi-automake.diff b/sdlbgi-automake.diff index 1b3dd3a..86d2c60 100644 --- a/sdlbgi-automake.diff +++ b/sdlbgi-automake.diff @@ -1,23 +1,30 @@ From: Jan Engelhardt Date: 2014-12-18 11:43:21.385084191 +0100 +Refresh: Thu May 7 13:22:40 CEST 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 | 6 ++++++ - 3 files changed, 17 insertions(+) + Makefile.am | 2 ++ + configure.ac | 9 +++++++++ + src/Makefile.am | 8 ++++++++ + src/SDL_bgi.c | 8 ++++++++ + src/SDL_bgi.h | 2 ++ + src/test/Makefile.am | 10 ++++++++++ + 6 files changed, 39 insertions(+) -Index: SDL_bgi-1.0.1/Makefile.am +Index: SDL_bgi-2.0.0/Makefile.am =================================================================== --- /dev/null -+++ SDL_bgi-1.0.1/Makefile.am ++++ SDL_bgi-2.0.0/Makefile.am @@ -0,0 +1,2 @@ +ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = src -Index: SDL_bgi-1.0.1/configure.ac +Index: SDL_bgi-2.0.0/configure.ac =================================================================== --- /dev/null -+++ SDL_bgi-1.0.1/configure.ac ++++ SDL_bgi-2.0.0/configure.ac @@ -0,0 +1,9 @@ +AC_INIT([SDL_bgi], [1.0.1]) +AC_CONFIG_AUX_DIR([build-aux]) @@ -25,17 +32,73 @@ Index: SDL_bgi-1.0.1/configure.ac +AC_PROG_CC +AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax dist-xz no-dist-gzip]) +LT_INIT -+PKG_CHECK_MODULES([sdlgfx], [SDL_gfx]) -+AC_CONFIG_FILES([Makefile src/Makefile]) ++PKG_CHECK_MODULES([sdl2], [sdl2]) ++AC_CONFIG_FILES([Makefile src/Makefile src/test/Makefile]) +AC_OUTPUT -Index: SDL_bgi-1.0.1/src/Makefile.am +Index: SDL_bgi-2.0.0/src/Makefile.am =================================================================== --- /dev/null -+++ SDL_bgi-1.0.1/src/Makefile.am -@@ -0,0 +1,6 @@ -+AM_CPPFLAGS = ${sdlgfx_CFLAGS} ++++ SDL_bgi-2.0.0/src/Makefile.am +@@ -0,0 +1,8 @@ ++SUBDIRS = . test ++AM_CPPFLAGS = ${sdl2_CFLAGS} +AM_CFLAGS = -Wall +lib_LTLIBRARIES = libSDL_bgi.la +libSDL_bgi_la_SOURCES = SDL_bgi.c -+libSDL_bgi_la_LIBADD = ${sdlgfx_LIBS} -+include_HEADERS = SDL_bgi.h ++libSDL_bgi_la_LIBADD = -lm ${sdl2_LIBS} ++pkgincludedir = ${includedir}/SDL2 ++pkginclude_HEADERS = SDL_bgi.h +Index: SDL_bgi-2.0.0/src/SDL_bgi.c +=================================================================== +--- SDL_bgi-2.0.0.orig/src/SDL_bgi.c ++++ SDL_bgi-2.0.0/src/SDL_bgi.c +@@ -2069,6 +2069,10 @@ void sdlbgifast (void) + { + bgi_fast_mode = 1; + } // sdlbgifast () ++void bgifast (void) ++{ ++ bgi_fast_mode = 1; ++} // sdlbgifast () + + // ----- + +@@ -2076,6 +2080,10 @@ void bgislow (void) + { + bgi_fast_mode = 0; + } // sdlbgislow () ++void sdlbgislow (void) ++{ ++ bgi_fast_mode = 0; ++} // sdlbgislow () + + // ----- + +Index: SDL_bgi-2.0.0/src/SDL_bgi.h +=================================================================== +--- SDL_bgi-2.0.0.orig/src/SDL_bgi.h ++++ SDL_bgi-2.0.0/src/SDL_bgi.h +@@ -307,6 +307,8 @@ int registerbgifont (void *); + void restorecrtmode (void); + void sdlbgifast (void); + void sdlbgislow (void); ++void bgifast (void); ++void bgislow (void); + void sector (int, int, int, int, int, int); + void setactivepage (int); + void setallpalette (struct palettetype *); +Index: SDL_bgi-2.0.0/src/test/Makefile.am +=================================================================== +--- /dev/null ++++ SDL_bgi-2.0.0/src/test/Makefile.am +@@ -0,0 +1,10 @@ ++AM_CPPFLAGS = -I${top_srcdir}/src ++AM_CFLAGS = -Wall ++EXTRA_PROGRAMS = \ ++ cellular dla fern floodfilltest hopalong life \ ++ mandelbrot mousetest moveit sdlbgidemo simple turtledemo ++LDADD = ../libSDL_bgi.la ++hopalong_LDADD = ${LDADD} -lm ++sdlbgidemo_LDADD = ${LDADD} -lm ++turtledemo_SOURCES = turtle.c turtledemo.c ++turtledemo_LDADD = ${LDADD} -lm