diff --git a/media-libs/plib/patches/plib-1.8.5.patch b/media-libs/plib/patches/plib-1.8.5.patchset similarity index 76% rename from media-libs/plib/patches/plib-1.8.5.patch rename to media-libs/plib/patches/plib-1.8.5.patchset index 43d307e7a..bed3d3d4f 100644 --- a/media-libs/plib/patches/plib-1.8.5.patch +++ b/media-libs/plib/patches/plib-1.8.5.patchset @@ -1,16 +1,22 @@ -diff -Naur plib-1.8.5/configure.in plib-1.8.5-haiku/configure.in ---- plib-1.8.5/configure.in 2008-03-11 02:09:43.007602176 +0000 -+++ plib-1.8.5-haiku/configure.in 2010-08-05 08:14:40.730071040 +0000 -@@ -36,7 +36,7 @@ +From 03fc92847bedaae2eb0bee1add87c13bd90fd981 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 23 Aug 2015 09:43:14 +0200 +Subject: applying patch plib-1.8.5.patch + + +diff --git a/configure.in b/configure.in +index d4b5c74..95c1ed6 100644 +--- a/configure.in ++++ b/configure.in +@@ -36,6 +36,7 @@ AC_PROG_CPP AC_PROG_CXX AC_PROG_CXXCPP AC_PROG_INSTALL --AC_PROG_RANLIB +AC_PROG_LIBTOOL + AC_PROG_RANLIB dnl Command line arguments - -@@ -276,7 +276,7 @@ +@@ -276,7 +277,7 @@ case "${host}" in LDFLAGS="$LDFLAGS $X_LIBS" @@ -19,7 +25,7 @@ diff -Naur plib-1.8.5/configure.in plib-1.8.5-haiku/configure.in dnl ========================================================= dnl if test "x$x_includes" != "x"; then -@@ -289,8 +289,8 @@ +@@ -289,8 +290,8 @@ dnl ========================================================= AC_CHECK_LIB(pthread, pthread_create) AC_CHECK_LIB(GL, glNewList) if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then @@ -30,7 +36,7 @@ diff -Naur plib-1.8.5/configure.in plib-1.8.5-haiku/configure.in AC_MSG_ERROR([could not find working GL library])) fi -@@ -356,6 +356,11 @@ +@@ -356,6 +357,11 @@ esac CFLAGS="$CFLAGS $WFLAG" CXXFLAGS="$CXXFLAGS $WFLAG" @@ -42,9 +48,10 @@ diff -Naur plib-1.8.5/configure.in plib-1.8.5-haiku/configure.in dnl FreeBSD requires the -pthread switch to enable pthreads. Look for this dnl weirdness. save_CXXFLAGS="$CXXFLAGS" -diff -Naur plib-1.8.5/src/fnt/fntTXF.cxx plib-1.8.5-haiku/src/fnt/fntTXF.cxx ---- plib-1.8.5/src/fnt/fntTXF.cxx 2008-03-11 02:06:20.022282240 +0000 -+++ plib-1.8.5-haiku/src/fnt/fntTXF.cxx 2010-08-05 08:14:40.734527488 +0000 +diff --git a/src/fnt/fntTXF.cxx b/src/fnt/fntTXF.cxx +index e664c90..ed44ef3 100644 +--- a/src/fnt/fntTXF.cxx ++++ b/src/fnt/fntTXF.cxx @@ -30,6 +30,8 @@ # include #elif defined(UL_WIN32) @@ -54,7 +61,7 @@ diff -Naur plib-1.8.5/src/fnt/fntTXF.cxx plib-1.8.5-haiku/src/fnt/fntTXF.cxx #else # include #endif -@@ -44,6 +46,8 @@ +@@ -44,6 +46,8 @@ static bool glIsValidContext ( void ) return ( aglGetCurrentContext () != NULL ) ; #elif defined(UL_MAC_OSX) return ( CGLGetCurrentContext () != NULL ) ; @@ -63,9 +70,10 @@ diff -Naur plib-1.8.5/src/fnt/fntTXF.cxx plib-1.8.5-haiku/src/fnt/fntTXF.cxx #else return ( glXGetCurrentContext () != NULL ) ; #endif -diff -Naur plib-1.8.5/src/js/jsNone.cxx plib-1.8.5-haiku/src/js/jsNone.cxx ---- plib-1.8.5/src/js/jsNone.cxx 2008-03-11 02:06:21.023330816 +0000 -+++ plib-1.8.5-haiku/src/js/jsNone.cxx 2010-08-05 08:14:40.737411072 +0000 +diff --git a/src/js/jsNone.cxx b/src/js/jsNone.cxx +index 300bdbc..7a93266 100644 +--- a/src/js/jsNone.cxx ++++ b/src/js/jsNone.cxx @@ -22,7 +22,7 @@ #include "js.h" @@ -75,9 +83,10 @@ diff -Naur plib-1.8.5/src/js/jsNone.cxx plib-1.8.5-haiku/src/js/jsNone.cxx struct os_specific_s ; -diff -Naur plib-1.8.5/src/pui/pu.cxx plib-1.8.5-haiku/src/pui/pu.cxx ---- plib-1.8.5/src/pui/pu.cxx 2008-03-11 02:06:23.030146560 +0000 -+++ plib-1.8.5-haiku/src/pui/pu.cxx 2010-08-05 08:14:40.741605376 +0000 +diff --git a/src/pui/pu.cxx b/src/pui/pu.cxx +index 2e3728f..226b44e 100644 +--- a/src/pui/pu.cxx ++++ b/src/pui/pu.cxx @@ -27,7 +27,7 @@ # include #elif defined(UL_CGL) @@ -87,7 +96,7 @@ diff -Naur plib-1.8.5/src/pui/pu.cxx plib-1.8.5-haiku/src/pui/pu.cxx # include #endif -@@ -107,7 +107,7 @@ +@@ -107,7 +107,7 @@ static bool glIsValidContext ( void ) return ( aglGetCurrentContext () != NULL ) ; #elif defined(UL_CGL) return ( CGLGetCurrentContext () != NULL ) ; @@ -96,10 +105,11 @@ diff -Naur plib-1.8.5/src/pui/pu.cxx plib-1.8.5-haiku/src/pui/pu.cxx return ( glXGetCurrentContext () != NULL ) ; #else return true ; -diff -Naur plib-1.8.5/src/pw/Makefile.am plib-1.8.5-haiku/src/pw/Makefile.am ---- plib-1.8.5/src/pw/Makefile.am 2008-03-11 02:06:20.019922944 +0000 -+++ plib-1.8.5-haiku/src/pw/Makefile.am 2010-08-05 07:45:50.000000000 +0000 -@@ -4,7 +4,7 @@ +diff --git a/src/pw/Makefile.am b/src/pw/Makefile.am +index 151fbd3..e38e8ce 100644 +--- a/src/pw/Makefile.am ++++ b/src/pw/Makefile.am +@@ -4,7 +4,7 @@ lib_LIBRARIES = libplibpw.a include_HEADERS = pw.h @@ -108,9 +118,11 @@ diff -Naur plib-1.8.5/src/pw/Makefile.am plib-1.8.5-haiku/src/pw/Makefile.am INCLUDES = -I$(top_srcdir)/src/util -diff -Naur plib-1.8.5/src/pw/pwHaiku.cxx plib-1.8.5-haiku/src/pw/pwHaiku.cxx ---- plib-1.8.5/src/pw/pwHaiku.cxx 1970-01-01 00:00:00.000000000 +0000 -+++ plib-1.8.5-haiku/src/pw/pwHaiku.cxx 2010-08-05 08:09:06.000000000 +0000 +diff --git a/src/pw/pwHaiku.cxx b/src/pw/pwHaiku.cxx +new file mode 100644 +index 0000000..e4636d4 +--- /dev/null ++++ b/src/pw/pwHaiku.cxx @@ -0,0 +1,200 @@ +#include "ul.h" + @@ -312,9 +324,10 @@ diff -Naur plib-1.8.5/src/pw/pwHaiku.cxx plib-1.8.5-haiku/src/pw/pwHaiku.cxx + + +#endif -diff -Naur plib-1.8.5/src/pw/pwX11.cxx plib-1.8.5-haiku/src/pw/pwX11.cxx ---- plib-1.8.5/src/pw/pwX11.cxx 2008-03-11 02:06:20.020447232 +0000 -+++ plib-1.8.5-haiku/src/pw/pwX11.cxx 2010-08-05 08:07:48.000000000 +0000 +diff --git a/src/pw/pwX11.cxx b/src/pw/pwX11.cxx +index 33488d7..b76bd01 100644 +--- a/src/pw/pwX11.cxx ++++ b/src/pw/pwX11.cxx @@ -2,7 +2,7 @@ /* ONLY COMPILE THIS FILE FOR GLX/X11 EQUIPPED SYSTEMS */ @@ -324,9 +337,10 @@ diff -Naur plib-1.8.5/src/pw/pwX11.cxx plib-1.8.5-haiku/src/pw/pwX11.cxx #include "pw.h" -diff -Naur plib-1.8.5/src/sl/sl.h plib-1.8.5-haiku/src/sl/sl.h ---- plib-1.8.5/src/sl/sl.h 2008-03-11 02:06:24.040894464 +0000 -+++ plib-1.8.5-haiku/src/sl/sl.h 2010-08-05 08:14:40.749731840 +0000 +diff --git a/src/sl/sl.h b/src/sl/sl.h +index 65325eb..7c8eeef 100644 +--- a/src/sl/sl.h ++++ b/src/sl/sl.h @@ -44,6 +44,8 @@ #define SLDSP_DEFAULT_DEVICE "/dev/audio" #elif defined(UL_MACINTOSH) || defined(UL_MAC_OSX) @@ -336,10 +350,11 @@ diff -Naur plib-1.8.5/src/sl/sl.h plib-1.8.5-haiku/src/sl/sl.h #else #error "Port me !" #endif -diff -Naur plib-1.8.5/src/sl/slDSP.cxx plib-1.8.5-haiku/src/sl/slDSP.cxx ---- plib-1.8.5/src/sl/slDSP.cxx 2008-03-11 02:06:24.040370176 +0000 -+++ plib-1.8.5-haiku/src/sl/slDSP.cxx 2010-08-05 08:14:40.753401856 +0000 -@@ -1080,6 +1080,72 @@ +diff --git a/src/sl/slDSP.cxx b/src/sl/slDSP.cxx +index 933e20b..8aaff1c 100644 +--- a/src/sl/slDSP.cxx ++++ b/src/sl/slDSP.cxx +@@ -1080,6 +1080,72 @@ float slDSP::secondsUsed () return secUsed; } @@ -412,9 +427,10 @@ diff -Naur plib-1.8.5/src/sl/slDSP.cxx plib-1.8.5-haiku/src/sl/slDSP.cxx #endif -diff -Naur plib-1.8.5/src/ssg/ssg.cxx plib-1.8.5-haiku/src/ssg/ssg.cxx ---- plib-1.8.5/src/ssg/ssg.cxx 2008-03-11 02:06:23.016252928 +0000 -+++ plib-1.8.5-haiku/src/ssg/ssg.cxx 2010-08-05 08:14:40.757596160 +0000 +diff --git a/src/ssg/ssg.cxx b/src/ssg/ssg.cxx +index bf678b3..737021a 100644 +--- a/src/ssg/ssg.cxx ++++ b/src/ssg/ssg.cxx @@ -31,6 +31,8 @@ # include #elif defined(UL_WIN32) @@ -424,7 +440,7 @@ diff -Naur plib-1.8.5/src/ssg/ssg.cxx plib-1.8.5-haiku/src/ssg/ssg.cxx #else # include #endif -@@ -45,6 +47,8 @@ +@@ -45,6 +47,8 @@ static bool glIsValidContext ( void ) return ( aglGetCurrentContext () != NULL ) ; #elif defined(UL_MAC_OSX) return ( CGLGetCurrentContext () != NULL ) ; @@ -433,9 +449,10 @@ diff -Naur plib-1.8.5/src/ssg/ssg.cxx plib-1.8.5-haiku/src/ssg/ssg.cxx #else return ( glXGetCurrentContext () != NULL ) ; #endif -diff -Naur plib-1.8.5/src/util/ul.h plib-1.8.5-haiku/src/util/ul.h ---- plib-1.8.5/src/util/ul.h 2008-03-11 02:10:13.027262976 +0000 -+++ plib-1.8.5-haiku/src/util/ul.h 2010-08-05 08:14:40.762576896 +0000 +diff --git a/src/util/ul.h b/src/util/ul.h +index d747047..4bc6f7e 100644 +--- a/src/util/ul.h ++++ b/src/util/ul.h @@ -60,7 +60,7 @@ #define UL_WIN32 1 #define UL_MSVC 1 /* Windoze AND MSVC. */ @@ -454,7 +471,7 @@ diff -Naur plib-1.8.5/src/util/ul.h plib-1.8.5-haiku/src/util/ul.h #endif #ifdef UL_MACINTOSH -@@ -647,7 +647,7 @@ +@@ -647,7 +647,7 @@ class ulDynamicLibrary } }; @@ -463,7 +480,7 @@ diff -Naur plib-1.8.5/src/util/ul.h plib-1.8.5-haiku/src/util/ul.h class ulDynamicLibrary { -@@ -675,8 +675,8 @@ +@@ -675,8 +675,8 @@ public: { void *sym = NULL ; @@ -474,7 +491,7 @@ diff -Naur plib-1.8.5/src/util/ul.h plib-1.8.5-haiku/src/util/ul.h B_SYMBOL_TYPE_TEXT, &sym ) == B_NO_ERROR ) return sym ; -@@ -686,7 +686,7 @@ +@@ -686,7 +686,7 @@ public: ~ulDynamicLibrary () { if ( handle != NULL ) @@ -483,3 +500,6 @@ diff -Naur plib-1.8.5/src/util/ul.h plib-1.8.5-haiku/src/util/ul.h delete handle ; } +-- +2.2.2 + diff --git a/media-libs/plib/plib-1.8.5.recipe b/media-libs/plib/plib-1.8.5.recipe index c9db21991..e3af6ae06 100644 --- a/media-libs/plib/plib-1.8.5.recipe +++ b/media-libs/plib/plib-1.8.5.recipe @@ -1,25 +1,61 @@ -DESCRIPTION="plib - A Suite of Portable Game Libraries" +SUMMARY="Steve's Portable Game Libraries" +DESCRIPTION="PLIB includes sound effects, music, a complete 3D engine, font rendering, a simple \ +Windowing library, a game scripting language, a GUI, networking, 3D math library and a collection \ +of handy utility functions. All are 100% portable across nearly all modern computing platforms. \ +What's more, it's all available on line - and completely free. Each library component is fairly \ +independent of the others - so if you want to use SDL, GTK, GLUT, or FLTK instead of PLIB's 'PW' \ +windowing library, you can." HOMEPAGE="http://plib.sourceforge.net/" -SOURCE_URI="http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz" -CHECKSUM_MD5="47a6fbf63668c1eed631024038b2ea90" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1999-2005 Steve J. Baker" +ARCHITECTURES="x86_gcc2" + +SOURCE_URI="http://plib.sourceforge.net/dist/plib-$portVersion.tar.gz" +CHECKSUM_SHA256="485b22bf6fdc0da067e34ead5e26f002b76326f6371e2ae006415dea6a380a32" +PATCHES="plib-$portVersion.patchset" + +PROVIDES=" + plib = $portVersion + devel:libplibfnt + devel:libplibjs + devel:libplibnet + devel:libplibpsl + devel:libplibpu + devel:libplibpuaux + devel:libplibpw + devel:libplibsg + devel:libplibsl + devel:libplibsm + devel:libplibssg + devel:libplibssgaux + devel:libplibul +" + +BUILD_REQUIRES=" + haiku_devel + devel:libGL +" + +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:awk + cmd:gcc + cmd:make +" BUILD() { - cd plib-1.8.5 - libtoolize --force --copy --install +#libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd plib-1.8.5 make install + prepareInstalledDevelLibs libplibfnt libplibjs libplibnet libplibpsl libplibpu libplibpuaux \ + libplibpw libplibsg libplibsl libplibsm libplibssg libplibssgaux libplibul } - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1999-2005 Steve J. Baker"