From 786a1be68fd6a85f42c29f03292d118d1ff56c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 18 Nov 2015 21:34:09 +0100 Subject: [PATCH 1/2] New package: xerces-c-3.1.2 --- common/shlibs | 1 + srcpkgs/libxerces-c | 1 + srcpkgs/libxerces-c-devel | 1 + srcpkgs/xerces-c/template | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+) create mode 120000 srcpkgs/libxerces-c create mode 120000 srcpkgs/libxerces-c-devel create mode 100644 srcpkgs/xerces-c/template diff --git a/common/shlibs b/common/shlibs index 662ec2d3e0f..bd73f233711 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2288,3 +2288,4 @@ libfloatfann.so.2 fann-2.2.0_1 libfixedfann.so.2 fann-2.2.0_1 libfann.so.2 fann-2.2.0_1 libdoublefann.so.2 fann-2.2.0_1 +libxerces-c-3.1.so libxerces-c-3.1.2_1 diff --git a/srcpkgs/libxerces-c b/srcpkgs/libxerces-c new file mode 120000 index 00000000000..17c953c82f5 --- /dev/null +++ b/srcpkgs/libxerces-c @@ -0,0 +1 @@ +xerces-c \ No newline at end of file diff --git a/srcpkgs/libxerces-c-devel b/srcpkgs/libxerces-c-devel new file mode 120000 index 00000000000..17c953c82f5 --- /dev/null +++ b/srcpkgs/libxerces-c-devel @@ -0,0 +1 @@ +xerces-c \ No newline at end of file diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template new file mode 100644 index 00000000000..346a164c1c1 --- /dev/null +++ b/srcpkgs/xerces-c/template @@ -0,0 +1,32 @@ +# Template file for 'xerces-c' +pkgname=xerces-c +version=3.1.2 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libcurl-devel icu55-devel" +depends="lib${pkgname}>=${version}_${revision}" +short_desc="Validating XML parser written in portable C++" +maintainer="Jürgen Buchmüller " +license="Apache-2.0" +homepage="http://xerces.apache.org/xerces-c/" +distfiles="http://apache.mirror.digionline.de//xerces/c/3/sources/${pkgname}-${version}.tar.bz2" +checksum=95d8655c4c50668ad60d555b59da9f31937b2c53638aa8d5768cb169f192d5e1 + +libxerces-c_package() { + short_desc+=" - shared library" + pkg_install() { + vmove usr/lib/libxerces-c-${version%.*}.so + } +} + +libxerces-c-devel_package() { + short_desc+=" - development files" + depends="lib${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/*.a + vmove usr/lib/libxerces-c.so + } +} From f9beadb9104dffc96fa58934c0763800345b3940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 18 Nov 2015 22:59:05 +0100 Subject: [PATCH 2/2] New package: enigma-1.21 --- srcpkgs/enigma-data | 1 + srcpkgs/enigma-doc | 1 + srcpkgs/enigma/patches/musl-redirect.patch | 31 +++++++++++++ .../enigma/patches/remove-SDL_ttf-check.patch | 25 ++++++++++ srcpkgs/enigma/template | 46 +++++++++++++++++++ 5 files changed, 104 insertions(+) create mode 120000 srcpkgs/enigma-data create mode 120000 srcpkgs/enigma-doc create mode 100644 srcpkgs/enigma/patches/musl-redirect.patch create mode 100644 srcpkgs/enigma/patches/remove-SDL_ttf-check.patch create mode 100644 srcpkgs/enigma/template diff --git a/srcpkgs/enigma-data b/srcpkgs/enigma-data new file mode 120000 index 00000000000..c8b486527c9 --- /dev/null +++ b/srcpkgs/enigma-data @@ -0,0 +1 @@ +enigma \ No newline at end of file diff --git a/srcpkgs/enigma-doc b/srcpkgs/enigma-doc new file mode 120000 index 00000000000..c8b486527c9 --- /dev/null +++ b/srcpkgs/enigma-doc @@ -0,0 +1 @@ +enigma \ No newline at end of file diff --git a/srcpkgs/enigma/patches/musl-redirect.patch b/srcpkgs/enigma/patches/musl-redirect.patch new file mode 100644 index 00000000000..15406d1ad50 --- /dev/null +++ b/srcpkgs/enigma/patches/musl-redirect.patch @@ -0,0 +1,31 @@ +In musl libc stdout and stderr are const and can't be +set to different files, thus disable --redirect. + +--- src/main.cc 2014-12-19 22:24:38.000000000 +0100 ++++ src/main.cc 2015-11-18 21:54:09.698790150 +0100 +@@ -131,7 +131,9 @@ + " --nomusic Disable music\n" + " --nosound Disable music and sound effects\n" + " --pref -p file Use filename or dirname for preferences\n" ++#if defined(__GLIBC__) + " --redirect Redirect stdout/stderr to files on user path\n" ++#endif + " --robinson avoid connections to the internet\n" + " --showfps Show the framerate (FPS) during the Game\n" + " --version Print the executable's version number\n" +@@ -298,6 +300,7 @@ + #ifdef WIN32 + ap.redirect = true; + #endif ++#if defined(__GLIBC__) + if (ap.redirect) { + FILE *newfp; + newfp = std::freopen((userStdPath + "/Output.log").c_str(), "w", stdout); +@@ -318,6 +321,7 @@ + } + setbuf(stderr, NULL); // No buffering + } ++#endif + + // initialize logfile -- needs ap + if (ap.do_log) diff --git a/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch b/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch new file mode 100644 index 00000000000..128dfbae0b2 --- /dev/null +++ b/srcpkgs/enigma/patches/remove-SDL_ttf-check.patch @@ -0,0 +1,25 @@ +Do not check for SDL_ttf version because it fails when +cross compiling. + +--- configure.ac 2014-12-19 22:26:06.000000000 +0100 ++++ configure.ac 2015-11-19 12:08:46.996789539 +0100 +@@ -176,19 +176,6 @@ + dnl ---------------------------------------- + dnl Check for SDL_ttf library + dnl --------------------------------------- +-if test "$MINGW32" = no; then +- AC_MSG_CHECKING([for SDL_ttf >=2.0.6]) +- AC_RUN_IFELSE([AC_LANG_SOURCE( +- [[#include +- int main(int argc, char *argv[]) { +- if (TTF_MAJOR_VERSION < 2) +- return 1; +- else if (TTF_MAJOR_VERSION == 2 && TTF_MINOR_VERSION == 0 && TTF_PATCHLEVEL < 6) +- return 1; +- return 0;}]])], +- [AC_MSG_RESULT([found])], +- [AC_MSG_ERROR([SDL_ttf >= 2.0.6 not found.])]) +-fi + AC_CHECK_LIB(SDL_ttf, main,,[AC_MSG_ERROR([SDL_ttf is required to compile Enigma])]) + + SDL_LIBS="$SDL_LIBS -lSDL_ttf" diff --git a/srcpkgs/enigma/template b/srcpkgs/enigma/template new file mode 100644 index 00000000000..1b94489a7f3 --- /dev/null +++ b/srcpkgs/enigma/template @@ -0,0 +1,46 @@ +# Template file for 'enigma' +pkgname=enigma +version=1.21 +revision=1 +build_style=gnu-configure +hostmakedepends="ImageMagick automake libtool gettext-devel SDL-devel pkg-config" +makedepends="libcurl-devel libxerces-c-devel SDL_mixer-devel SDL_image-devel SDL_ttf-devel" +depends="enigma-data>=${version}_${revision}" +short_desc="Puzzle game inspired by Oxyd on the Atari ST" +maintainer="Jürgen Buchmüller " +license="GPL-2" +homepage="http://www.nongnu.org/enigma/" +distfiles="${SOURCEFORGE_SITE}/enigma-game/Release%20${version}/${pkgname}-${version}.tar.gz" +checksum=d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01 + +CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/SDL" + +pre_configure() { + local dir + for dir in . lib-src/enet lib-src/zipios++; do + [ ! -f ${dir}/COPYING ] && cp ${wrksrc}/doc/gpl.txt ${dir}/COPYING + touch ${dir}/NEWS ${dir}/AUTHORS ${dir}/ChangeLog + done + autoreconf -if +} + +post_install() { + # remove the libenet headers and static library + rm -r ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/libenet.a +} + +enigma-data_package() { + short_desc+=" - data files" + noarch=yes + pkg_install() { + vmove usr/share/enigma + } +} + +enigma-doc_package() { + short_desc+=" - documentation" + noarch=yes + pkg_install() { + vmove usr/share/doc + } +}