Added patch to let it compile on x86-fbsd, keyworded x86-fbsd

Package-Manager: portage-2.1.2.2

diff --git a/media-libs/libprojectm/ChangeLog b/media-libs/libprojectm/ChangeLog
index c5396ba2832359280fd7e1055eb5a3366cdcddbb..2b9370d550207d264af97da45b08e6bb13eff3bf 100644 (file)
--- a/media-libs/libprojectm/ChangeLog
+++ b/media-libs/libprojectm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libprojectm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.6 2007/03/11 01:11:21 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.7 2007/03/11 23:40:36 welp Exp $
+
+*libprojectm-0.99-r1 (11 Mar 2007)
+
+  11 Mar 2007; Peter Weller <welp@gentoo.org> +files/libprojectm-fbsd.patch,
+  +libprojectm-0.99-r1.ebuild:
+  Added patch to let it compile on x86-fbsd, keyworded x86-fbsd
 
   11 Mar 2007; Bryan Østergaard <kloeri@gentoo.org>
   libprojectm-0.99.ebuild:

diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index c62d1d7ca5a7e1c7f965cf5593a2685bd56b4b3e..de92b33f61df76039f1476bcaef75262b9e9d578 100644 (file)
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,15 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libprojectm-fbsd.patch 3693 RMD160 13ea332af3d210dc58d816e17fde51063cab70f5 SHA1 2b51513be1e0926d614f9ab4a72aac75ce9b5109 SHA256 861d40f21295a9de8431fcb09bb2fa9aa4b3f928f4fd4ae2a98263978b6b6577
+MD5 af4ae374a2463f5c5e5380271efa0fa0 files/libprojectm-fbsd.patch 3693
+RMD160 13ea332af3d210dc58d816e17fde51063cab70f5 files/libprojectm-fbsd.patch 3693
+SHA256 861d40f21295a9de8431fcb09bb2fa9aa4b3f928f4fd4ae2a98263978b6b6577 files/libprojectm-fbsd.patch 3693
 DIST libprojectM-0.99.tar.bz2 593967 RMD160 1eae8abdcba3b26e733e73202d49fd0646bc96fa SHA1 6a4fda8828aa2a5cdeb34674ba62a240823fdc48 SHA256 cd359df2bb89e89a9c4cc4a1f5bf44ac3ec4776fb9834a5aa2e3ca297a7dcc06
+EBUILD libprojectm-0.99-r1.ebuild 928 RMD160 e31997bfa8af1513b30140809369cf74808cc47b SHA1 f8e097e2c381bb00808fd680b614a17261a8b6e1 SHA256 73b4bbc189ec0f61c70e50754d609f19ee075ee15a2d2611bf402a3feacd15c6
+MD5 0bea50a7fb22051979e0991fb1fd098e libprojectm-0.99-r1.ebuild 928
+RMD160 e31997bfa8af1513b30140809369cf74808cc47b libprojectm-0.99-r1.ebuild 928
+SHA256 73b4bbc189ec0f61c70e50754d609f19ee075ee15a2d2611bf402a3feacd15c6 libprojectm-0.99-r1.ebuild 928
 EBUILD libprojectm-0.99.ebuild 755 RMD160 713a86d4a673f45ccab86b7b7516decea3021536 SHA1 953d55ea2b59aa2795e73008c66becf3fbd67062 SHA256 f88c0206110a254ecd88dcc126f5c54949b887099219e15220553bd817bbd88f
 MD5 8bec6a0f69abd645c83f8fc2be1074a3 libprojectm-0.99.ebuild 755
 RMD160 713a86d4a673f45ccab86b7b7516decea3021536 libprojectm-0.99.ebuild 755
 SHA256 f88c0206110a254ecd88dcc126f5c54949b887099219e15220553bd817bbd88f libprojectm-0.99.ebuild 755
-MISC ChangeLog 1003 RMD160 6d51234f7bdc6beebefdd9755dd43e6369ac94fc SHA1 d49f4d16dde5ca95e285473b90b973b50ef05f7f SHA256 0f0035191d9e3d88bce79aa36c4bccf5c79c38931d16daea386e61cbf8b80a31
-MD5 febfa640277b359992492b60fd8b92d9 ChangeLog 1003
-RMD160 6d51234f7bdc6beebefdd9755dd43e6369ac94fc ChangeLog 1003
-SHA256 0f0035191d9e3d88bce79aa36c4bccf5c79c38931d16daea386e61cbf8b80a31 ChangeLog 1003
+MISC ChangeLog 1210 RMD160 d6cd3836142446b630de6c53cb2bf856c0145a7d SHA1 5b63ebfddeb6c34293cdeaba2d1bf8d3027a72c0 SHA256 c8e64e604f27b03f1644aab4c83fb10ac9847719d28da7efefb550d02d36fed1
+MD5 d2ab2444180fc8dd6d056f939c754828 ChangeLog 1210
+RMD160 d6cd3836142446b630de6c53cb2bf856c0145a7d ChangeLog 1210
+SHA256 c8e64e604f27b03f1644aab4c83fb10ac9847719d28da7efefb550d02d36fed1 ChangeLog 1210
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -17,10 +22,6 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 3409c86ec7db5fb239e1b6487be71a97 files/digest-libprojectm-0.99 253
 RMD160 748f31c910d988dfddd0156a5ca63fb274dcb3d3 files/digest-libprojectm-0.99 253
 SHA256 9b72759c27e68b409b69d9253034d382d79e0b33d0b752da48e29918487200d6 files/digest-libprojectm-0.99 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF81cBugEuf3OQ0akRAm0rAJ499zUtOJATa2nZoQK/uvY9btTsrACfcCi6
-l6vN/Jq3asnLore9h0piU+4=
-=8VMP
------END PGP SIGNATURE-----
+MD5 3409c86ec7db5fb239e1b6487be71a97 files/digest-libprojectm-0.99-r1 253
+RMD160 748f31c910d988dfddd0156a5ca63fb274dcb3d3 files/digest-libprojectm-0.99-r1 253
+SHA256 9b72759c27e68b409b69d9253034d382d79e0b33d0b752da48e29918487200d6 files/digest-libprojectm-0.99-r1 253

diff --git a/media-libs/libprojectm/files/digest-libprojectm-0.99-r1 b/media-libs/libprojectm/files/digest-libprojectm-0.99-r1
new file mode 100644 (file)
index 0000000..ffbda77
--- /dev/null
+++ b/media-libs/libprojectm/files/digest-libprojectm-0.99-r1
@@ -0,0 +1,3 @@
+MD5 20dc0aa2af96340c3209c9795cc3217d libprojectM-0.99.tar.bz2 593967
+RMD160 1eae8abdcba3b26e733e73202d49fd0646bc96fa libprojectM-0.99.tar.bz2 593967
+SHA256 cd359df2bb89e89a9c4cc4a1f5bf44ac3ec4776fb9834a5aa2e3ca297a7dcc06 libprojectM-0.99.tar.bz2 593967

diff --git a/media-libs/libprojectm/files/libprojectm-fbsd.patch b/media-libs/libprojectm/files/libprojectm-fbsd.patch
new file mode 100644 (file)
index 0000000..d909933
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-fbsd.patch
@@ -0,0 +1,104 @@
+--- libprojectM/src/preset.cc.orig     2006-06-28 17:45:36.000000000 -0300
++++ libprojectM/src/preset.cc  2007-02-26 23:58:08.643514331 -0300
+@@ -69,6 +69,7 @@
+ 
+ #include "idle_preset.h"
+ #include "wipemalloc.h"
++#include "config.h"
+ 
+ /* The maximum number of preset names loaded into buffer */
+ #define MAX_PRESETS_IN_DIR 50000 
+@@ -638,7 +642,7 @@
+   preset->per_pixel_eqn_tree = create_splaytree((int (*)(void*,void*))compare_int, (void* (*)(void*))copy_int, (void (*)(void*))free_int);
+ 
+   /* Convert string to a stream */
+-#if !defined(MACOS) && !defined(WIN32)
++#if !defined(MACOS) && !defined(WIN32) && !defined(__FreeBSD__)
+       {
+               FILE* fs = fmemopen (s, strlen(s), "r");
+               char c;
+@@ -693,7 +697,7 @@
+   preset->per_frame_eqn_tree = create_splaytree((int (*)(void*,void*))compare_int,(void* (*)(void*)) copy_int, (void (*)(void*))free_int);
+ 
+   /* Convert string to a stream */
+-#if !defined(MACOS) && !defined(WIN32)
++#if !defined(MACOS) && !defined(WIN32) && !defined(__FreeBSD__)
+       {
+               FILE* fs = fmemopen (s, strlen(s), "r");
+               char c;
+--- libprojectM/configure.ac.orig      2006-06-28 17:45:36 -0300
++++ libprojectM/configure.ac   2007-03-04 11:43:06 -0300
+@@ -33,6 +33,7 @@
+ AC_FUNC_FORK
+ AC_FUNC_MALLOC
+ AC_FUNC_STRTOD
++AC_SEARCH_LIBS([floor, pow, sqrt], [m])
+ AC_CHECK_FUNCS([floor gettimeofday memset pow setenv sqrt strcasecmp strchr strstr strtol strverscmp])
+ 
+ PKG_CHECK_MODULES(FTGL, ftgl >= 2.0.0, [libft="yes"], [libft="no"])
+--- libprojectM.orig/m4/ac_proto_scandir.m4    1969-12-31 21:00:00 -0300
++++ libprojectM/m4/ac_proto_scandir.m4 2007-03-04 13:30:14 -0300
+@@ -0,0 +1,33 @@
++dnl @synopsis AC_PROTO_SCANDIR
++dnl
++dnl Defines the third scandir() argument with or without a const.
++dnl
++dnl Should be called after checking for the correct <dirent.h>
++dnl
++dnl @category InstalledPackages
++dnl @author Javier Villavicencio <the_paya@gentoo.org>
++dnl @version 2007-03-04
++dnl @license BSD-2
++
++AC_DEFUN([AC_PROTO_SCANDIR],[
++  AC_MSG_CHECKING([for scandir prototype])
++  AC_LANG_PUSH(C++)
++  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
++    #include <dirent.h>
++  ]], [[
++    const char * dir = 0;
++    struct dirent ***namelist = 0;
++    int(* select)(const struct dirent *) = 0;
++    scandir(dir, namelist, select, alphasort);
++    ]]),
++    [
++      AC_DEFINE([SCANDIR_ARG3], [const struct dirent*],[Correct third argument to scandir.])
++      AC_MSG_RESULT([const struct dirent*])
++    ],
++    [
++      AC_DEFINE([SCANDIR_ARG3], [struct dirent*],[Correct third argument to scandir.])
++      AC_MSG_RESULT([struct dirent*])
++    ]
++  )
++ AC_LANG_POP(C++)
++])
+--- libprojectM.orig/src/preset.cc     2007-03-04 13:31:38 -0300
++++ libprojectM/src/preset.cc  2007-03-04 13:31:22 -0300
+@@ -93,7 +93,7 @@
+ int preset_index = -1;
+ 
+ preset_t * load_preset(const char * pathname);
+-int is_valid_extension(const struct dirent* ent);
++int is_valid_extension(SCANDIR_ARG3 ent);
+ int load_preset_file(const char * pathname, preset_t * preset);
+ int close_preset(preset_t * preset);
+ 
+@@ -560,7 +560,7 @@
+ 
+ /* Returns nonzero if string 'name' contains .milk or
+    (the better) .prjm extension. Not a very strong function currently */
+-int is_valid_extension(const struct dirent* ent) {
++int is_valid_extension(SCANDIR_ARG3 ent) {
+       const char* ext = 0;
+       
+       if (!ent) return FALSE;
+--- libprojectM/configure.ac.orig      2007-03-04 13:35:57 -0300
++++ libprojectM/configure.ac   2007-03-04 13:36:45 -0300
+@@ -35,6 +35,7 @@
+ AC_FUNC_STRTOD
+ AC_SEARCH_LIBS([floor, pow, sqrt], [m])
+ AC_CHECK_FUNCS([floor gettimeofday memset pow setenv sqrt strcasecmp strchr strstr strtol strverscmp])
++AC_PROTO_SCANDIR
+ 
+ PKG_CHECK_MODULES(FTGL, ftgl >= 2.0.0, [libft="yes"], [libft="no"])
+ if test x$libft = xno; then

diff --git a/media-libs/libprojectm/libprojectm-0.99-r1.ebuild b/media-libs/libprojectm/libprojectm-0.99-r1.ebuild
new file mode 100644 (file)
index 0000000..60dd118
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-0.99-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-0.99-r1.ebuild,v 1.1 2007/03/11 23:40:36 welp Exp $
+
+inherit eutils autotools
+
+MY_PN="${PN/libprojectm/libprojectM}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="http://xmms-projectm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmms-projectm/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="media-libs/ftgl
+       media-libs/freetype
+       virtual/opengl
+       sys-libs/zlib"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}/${PN}-fbsd.patch"
+       AT_M4DIR="m4" eautoreconf || die "eautoreconf failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+}