Attachment #41379 for bug #64791

View | Details | Raw Unified | Return to bug 64791
Collapse All | Expand All




#

PORTNAME=	allegrogl
PORTVERSION=	0.2.2
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

GNU_CONFIGURE=	yes
MAKEFILE=	makefile
ALL_TARGET=	lib
INSTALLS_SHLIB=	yes

WRKSRC=		${WRKDIR}/alleggl


	@${REINPLACE_CMD} -e 's|%%ALLEGRO_CONFIG%%|${ALLEGRO_CONFIG}|g' \
		${WRKSRC}/make/makefile.unx

post-install:
	${INSTALL_DATA} ${WRKSRC}/lib/unix/libagl.a ${PREFIX}/lib
	${INSTALL_DATA} ${WRKSRC}/include/alleggl.h ${PREFIX}/include
	${INSTALL_DATA} ${WRKSRC}/include/alleggl_config.h ${PREFIX}/include
	@${MKDIR} ${PREFIX}/include/allegrogl
	${INSTALL_DATA} ${WRKSRC}/include/allegrogl/*.h \
		${PREFIX}/include/allegrogl
	@${MKDIR} ${PREFIX}/include/allegrogl/GLext
	${INSTALL_DATA} ${WRKSRC}/include/allegrogl/GLext/*.h \
		${PREFIX}/include/allegrogl/GLext

	@${MKDIR} ${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/examp/* ${EXAMPLESDIR}
	@${PERL} -pi -e 's|%%CC%%|${CC}|g; \

Line 1 Link Here

(-)allegrogl/distinfo (-1 / +2 lines)
1	MD5 (alleggl-0.2.0.tar.bz2) = 54080f3f549bbf25ba04be7c3e8a42a5	1	MD5 (alleggl-0.2.2.tar.bz2) = 39e0f482c895ba97381f64c5a5d79f7d
		2	SIZE (alleggl-0.2.2.tar.bz2) = 307967




--- configure.in.orig	Sat Feb 21 19:38:28 2004
+++ configure.in	Sat Mar 20 07:14:42 2004
@@ -52,7 +52,7 @@
 
 dnl Check for pthread support, which GL libs may require (e.g. FreeBSD)
 AC_CHECK_HEADER(pthread.h, , dontcare=y)

 
 
 dnl Build Mesa generic driver
@@ -171,14 +171,14 @@
 	fi
 
 
+dnl We don't need this check in FreeBSD
 dnl Check if the dynamic loading library (libdl.so) is available
-	AH_TEMPLATE([ALLEGROGL_HAVE_DYNAMIC_LINK], [Define if dynamic linking is supported.])
-	AC_CHECK_HEADER(dlfcn.h,
-		AC_CHECK_LIB(dl, dlsym, 
-			LIBS="-ldl $LIBS"
+dnl	AH_TEMPLATE([ALLEGROGL_HAVE_DYNAMIC_LINK], [Define if dynamic linking is supported.])
+dnl	AC_CHECK_HEADER(dlfcn.h,
+dnl		AC_CHECK_LIB(dl, dlsym, 
+dnl			LIBS="-ldl $LIBS"
 			AC_DEFINE(ALLEGROGL_HAVE_DYNAMIC_LINK)
-		)
-	)
+dnl		)
+dnl	)
 fi
 
 
@@ -155,14 +156,14 @@
 dnl the Mesa generic driver and the (hopefully) accelerated one
 if test -f makefile; then
 	echo '# Remove older build'

 	agl_make_depend="yes";
 fi
 
@@ -189,5 +189,5 @@
 
 dnl Run "make depend" if necessary
 if test -n "$agl_make_depend"; then




--- include/allegrogl/gl_ext.h.orig	Sun Dec 14 01:19:34 2003
+++ include/allegrogl/gl_ext.h	Thu Jan 22 14:46:25 2004
@@ -12,7 +12,7 @@
 #include "allegrogl/GLext/gl_ext_defs.h"
 #ifdef ALLEGRO_WINDOWS
 #include "allegrogl/GLext/wgl_ext_defs.h"
-#elif defined ALLEGRO_LINUX
+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
 #include "allegrogl/GLext/glx_ext_defs.h"
 #endif
 
@@ -27,7 +27,7 @@
 #	include "allegrogl/GLext/gl_ext_api.h"
 #ifdef ALLEGRO_WINDOWS
 #	include "allegrogl/GLext/wgl_ext_api.h"
-#elif defined ALLEGRO_LINUX
+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
 #	include "allegrogl/GLext/glx_ext_api.h"
 #endif
 #undef AGL_API
@@ -46,7 +46,7 @@
 #define AGL_API(type, name, args) extern AGL_##name##_t wgl##name;
 #	include "allegrogl/GLext/wgl_ext_api.h"
 #undef AGL_API
-#elif defined ALLEGRO_LINUX
+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
 #define AGL_API(type, name, args) extern AGL_##name##_t glX##name;
 #	include "allegrogl/GLext/glx_ext_api.h"
 #undef AGL_API

Lines 1-6 Link Here

(-)allegrogl/files/patch-make-makefile.unx (-8 / +20 lines)
1	--- make/makefile.unx.orig Thu Jan 22 14:15:30 2004	1	--- make/makefile.unx.orig Sat Feb 21 18:25:06 2004
2	+++ make/makefile.unx Thu Jan 22 14:17:05 2004	2	+++ make/makefile.unx Fri Mar 26 20:55:17 2004
3	@@ -46,20 +46,20 @@	3	@@ -18,7 +18,7 @@
		4	# Programs
		5	CC = @CC@
		6	CXX = @CXX@
		7	-INSTALLER = @INSTALL@ -D -m 644
		8	+INSTALLER = @INSTALL@ -m 644
		9
		10
		11	# Where to install the library and header file
		12	@@ -49,13 +49,13 @@
4	# --- Compiler optimizations ---#	13	# --- Compiler optimizations ---#
5		14
6	ifdef DEBUGMODE	15	ifdef DEBUGMODE
Lines 13-27 Link Here
13	else	22	else
14	- CFLAGS = -O2 -Wall -ffast-math -fomit-frame-pointer	23	- CFLAGS = -O2 -Wall -ffast-math -fomit-frame-pointer
15	+ CFLAGS += -O2 -Wall -ffast-math -fomit-frame-pointer	24	+ CFLAGS += -O2 -Wall -ffast-math -fomit-frame-pointer
16	SHARED = @SHARED@	25	endif
		26
		27	ifdef SHARED
		28	@@ -65,9 +65,9 @@
17	endif	29	endif
18		30
19	ifdef DEBUGALLEG	31	ifdef DEBUGALLEG
20	- LDLIBS = -l$(LIB_NAME) `allegro-config --libs debug` $(LIBS)	32	- LDLIBS += `allegro-config --libs debug` $(LIBS)
21	+ LDLIBS = -l$(LIB_NAME) `%%ALLEGRO_CONFIG%% --libs debug` $(LIBS)	33	+ LDLIBS += `/usr/local/bin/allegro-config --libs debug` $(LIBS)
22	else	34	else
23	- LDLIBS = -l$(LIB_NAME) `allegro-config --libs` $(LIBS)	35	- LDLIBS += `allegro-config --libs` $(LIBS)
24	+ LDLIBS = -l$(LIB_NAME) `%%ALLEGRO_CONFIG%% --libs` $(LIBS)	36	+ LDLIBS += `/usr/local/bin/allegro-config --libs` $(LIBS)
25	endif	37	endif
26		38
27	ifdef MESABUILD	39	ifdef MESABUILD




--- src/glext.c.orig	Thu Jan  8 01:04:04 2004
+++ src/glext.c	Thu Jan 22 16:32:43 2004
@@ -20,7 +20,7 @@
 #	include "allegrogl/GLext/gl_ext_api.h"
 #ifdef ALLEGRO_WINDOWS
 #	include "allegrogl/GLext/wgl_ext_api.h"
-#elif defined ALLEGRO_LINUX
+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
 #	include "allegrogl/GLext/glx_ext_api.h"
 #endif
 } AGL_EXT;
@@ -105,7 +105,7 @@
 #define AGL_API(type, name, args) AGL_##name##_t wgl##name = NULL;
 #	include "allegrogl/GLext/wgl_ext_api.h"
 #undef AGL_API
-#elif defined ALLEGRO_LINUX
+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
 #define AGL_API(type, name, args) AGL_##name##_t glX##name = NULL;
 #	include "allegrogl/GLext/glx_ext_api.h"
 #undef AGL_API
@@ -153,7 +153,7 @@
 		if (ext->name) { AGL_LOG(2,"wgl" #name " successfully loaded\n"); }
 #	include "allegrogl/GLext/wgl_ext_api.h"
 #	undef AGL_API
-#	elif defined ALLEGRO_LINUX
+#	elif defined ALLEGRO_LINUX || defined __FreeBSD__
 #	define AGL_API(type, name, args) \
 		ext->name = (AGL_##name##_t)aglXGetProcAddress("gl" #name); \
 		if (ext->name) { AGL_LOG(2,"gl" #name " successfully loaded\n"); }
@@ -197,7 +197,7 @@
 #define AGL_API(type, name, args) wgl##name = ext->name;
 #	include "allegrogl/GLext/wgl_ext_api.h"
 #undef AGL_API
-#elif defined ALLEGRO_LINUX
+#elif defined ALLEGRO_LINUX || defined __FreeBSD__
 #define AGL_API(type, name, args) glX##name = ext->name;
 #	include "allegrogl/GLext/glx_ext_api.h"
 #undef AGL_API
@@ -344,7 +344,7 @@
 		 * we try to find the symbol into the dynamic libs
 		 * that are already loaded (e.g. in libGL.so)
 		 */
-		symbol = dlsym(0, name);
+		symbol = dlsym(RTLD_NEXT, name);
 	}
 #elif defined ALLEGRO_MACOSX
 	function = CFStringCreateWithCString(kCFAllocatorDefault, name,
@@ -439,10 +439,10 @@
 
 	/* Get glXGetProcAddress entry */
 #ifdef ALLEGROGL_HAVE_DYNAMIC_LINK
-	aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(0,
+	aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(RTLD_NEXT,
 	                                                    "glXGetProcAddressARB");
 	if (!aglXGetProcAddress) {
-		aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(0,
+		aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(RTLD_NEXT,
 	                                                       "glXGetProcAddress");
 	}
 	TRACE("glXGetProcAddress Extension: %s\n",




include/alleggl_config.h
include/allegrogl/gl_ext.h
include/allegrogl/gl_header_detect.h
include/allegrogl/GLext/gl_ext_alias.h
include/allegrogl/GLext/gl_ext_api.h
include/allegrogl/GLext/gl_ext_defs.h
include/allegrogl/GLext/gl_ext_list.h
include/allegrogl/GLext/glx_ext_alias.h
include/allegrogl/GLext/glx_ext_api.h
include/allegrogl/GLext/glx_ext_defs.h
include/allegrogl/GLext/glx_ext_list.h
include/allegrogl/GLext/wgl_ext_api.h
include/allegrogl/GLext/wgl_ext_defs.h
include/allegrogl/GLext/wgl_ext_list.h
@dirrm include/allegrogl/GLext
@dirrm include/allegrogl
lib/libagl.so
%%EXAMPLESDIR%%/demofont.dat
%%EXAMPLESDIR%%/dialog.c
%%EXAMPLESDIR%%/dumbtest.c

Return to bug 64791

Lines 6-13 Link Here

(-)allegrogl/Makefile (-13 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= allegrogl	8	PORTNAME= allegrogl
9	PORTVERSION= 0.2.0	9	PORTVERSION= 0.2.2
10	PORTREVISION= 1
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 27-32 Link Here
27	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
28	MAKEFILE= makefile	27	MAKEFILE= makefile
29	ALL_TARGET= lib	28	ALL_TARGET= lib
		29	INSTALLS_SHLIB= yes
30		30
31	WRKSRC= ${WRKDIR}/alleggl	31	WRKSRC= ${WRKDIR}/alleggl
32		32
Lines 39-55 Link Here
39	@${REINPLACE_CMD} -e 's\|%%ALLEGRO_CONFIG%%\|${ALLEGRO_CONFIG}\|g' \	39	@${REINPLACE_CMD} -e 's\|%%ALLEGRO_CONFIG%%\|${ALLEGRO_CONFIG}\|g' \
40	${WRKSRC}/make/makefile.unx	40	${WRKSRC}/make/makefile.unx
41		41
42	do-install:	42	post-install:
43	${INSTALL_DATA} ${WRKSRC}/lib/unix/libagl.a ${PREFIX}/lib
44	${INSTALL_DATA} ${WRKSRC}/include/alleggl.h ${PREFIX}/include
45	${INSTALL_DATA} ${WRKSRC}/include/alleggl_config.h ${PREFIX}/include
46	@${MKDIR} ${PREFIX}/include/allegrogl
47	${INSTALL_DATA} ${WRKSRC}/include/allegrogl/*.h \
48	${PREFIX}/include/allegrogl
49	@${MKDIR} ${PREFIX}/include/allegrogl/GLext
50	${INSTALL_DATA} ${WRKSRC}/include/allegrogl/GLext/*.h \
51	${PREFIX}/include/allegrogl/GLext
52
53	@${MKDIR} ${EXAMPLESDIR}	43	@${MKDIR} ${EXAMPLESDIR}
54	${INSTALL_DATA} ${WRKSRC}/examp/* ${EXAMPLESDIR}	44	${INSTALL_DATA} ${WRKSRC}/examp/* ${EXAMPLESDIR}
55	@${PERL} -pi -e 's\|%%CC%%\|${CC}\|g; \	45	@${PERL} -pi -e 's\|%%CC%%\|${CC}\|g; \

Lines 1-6 Link Here

(-)allegrogl/files/patch-configure.in (-27 / +5 lines)
1	--- configure.in.orig Sat Sep 6 21:26:48 2003	1	--- configure.in.orig Sat Feb 21 19:38:28 2004
2	+++ configure.in Thu Jan 22 14:58:15 2004	2	+++ configure.in Sat Mar 20 07:14:42 2004
3	@@ -50,7 +50,7 @@	3	@@ -52,7 +52,7 @@
4		4
5	dnl Check for pthread support, which GL libs may require (e.g. FreeBSD)	5	dnl Check for pthread support, which GL libs may require (e.g. FreeBSD)
6	AC_CHECK_HEADER(pthread.h, , dontcare=y)	6	AC_CHECK_HEADER(pthread.h, , dontcare=y)
Lines 9-37 Link Here
9		9
10		10
11	dnl Build Mesa generic driver	11	dnl Build Mesa generic driver
12	@@ -96,14 +96,15 @@	12	@@ -171,14 +171,14 @@
13	fi
14
15
16	+dnl We don't need this check in FreeBSD
17	dnl Check if the dynamic loading library (libdl.so) is available
18	- AH_TEMPLATE([ALLEGROGL_HAVE_DYNAMIC_LINK], [Define if dynamic linking is supported.])
19	- AC_CHECK_HEADER(dlfcn.h,
20	- AC_CHECK_LIB(dl, dlsym,
21	- LIBS="-ldl $LIBS"
22	+dnl AH_TEMPLATE([ALLEGROGL_HAVE_DYNAMIC_LINK], [Define if dynamic linking is supported.])
23	+dnl AC_CHECK_HEADER(dlfcn.h,
24	+dnl AC_CHECK_LIB(dl, dlsym,
25	+dnl LIBS="-ldl $LIBS"
26	AC_DEFINE(ALLEGROGL_HAVE_DYNAMIC_LINK)
27	- )
28	- )
29	+dnl )
30	+dnl )
31	fi
32
33
34	@@ -155,14 +156,14 @@
35	dnl the Mesa generic driver and the (hopefully) accelerated one	13	dnl the Mesa generic driver and the (hopefully) accelerated one
36	if test -f makefile; then	14	if test -f makefile; then
37	echo '# Remove older build'	15	echo '# Remove older build'
Lines 48-54 Link Here
48	agl_make_depend="yes";	26	agl_make_depend="yes";
49	fi	27	fi
50		28
51	@@ -173,5 +174,5 @@	29	@@ -189,5 +189,5 @@
52		30
53	dnl Run "make depend" if necessary	31	dnl Run "make depend" if necessary
54	if test -n "$agl_make_depend"; then	32	if test -n "$agl_make_depend"; then

Lines 1-29 Link Here

(-)allegrogl/files/patch-include-allegrogl-gl_ext.h (-29 lines)
1	--- include/allegrogl/gl_ext.h.orig Sun Dec 14 01:19:34 2003
2	+++ include/allegrogl/gl_ext.h Thu Jan 22 14:46:25 2004
3	@@ -12,7 +12,7 @@
4	#include "allegrogl/GLext/gl_ext_defs.h"
5	#ifdef ALLEGRO_WINDOWS
6	#include "allegrogl/GLext/wgl_ext_defs.h"
7	-#elif defined ALLEGRO_LINUX
8	+#elif defined ALLEGRO_LINUX \|\| defined __FreeBSD__
9	#include "allegrogl/GLext/glx_ext_defs.h"
10	#endif
11
12	@@ -27,7 +27,7 @@
13	# include "allegrogl/GLext/gl_ext_api.h"
14	#ifdef ALLEGRO_WINDOWS
15	# include "allegrogl/GLext/wgl_ext_api.h"
16	-#elif defined ALLEGRO_LINUX
17	+#elif defined ALLEGRO_LINUX \|\| defined __FreeBSD__
18	# include "allegrogl/GLext/glx_ext_api.h"
19	#endif
20	#undef AGL_API
21	@@ -46,7 +46,7 @@
22	#define AGL_API(type, name, args) extern AGL_##name##_t wgl##name;
23	# include "allegrogl/GLext/wgl_ext_api.h"
24	#undef AGL_API
25	-#elif defined ALLEGRO_LINUX
26	+#elif defined ALLEGRO_LINUX \|\| defined __FreeBSD__
27	#define AGL_API(type, name, args) extern AGL_##name##_t glX##name;
28	# include "allegrogl/GLext/glx_ext_api.h"
29	#undef AGL_API

Lines 1-60 Link Here

(-)allegrogl/files/patch-src-glext.c (-60 lines)
1	--- src/glext.c.orig Thu Jan 8 01:04:04 2004
2	+++ src/glext.c Thu Jan 22 16:32:43 2004
3	@@ -20,7 +20,7 @@
4	# include "allegrogl/GLext/gl_ext_api.h"
5	#ifdef ALLEGRO_WINDOWS
6	# include "allegrogl/GLext/wgl_ext_api.h"
7	-#elif defined ALLEGRO_LINUX
8	+#elif defined ALLEGRO_LINUX \|\| defined __FreeBSD__
9	# include "allegrogl/GLext/glx_ext_api.h"
10	#endif
11	} AGL_EXT;
12	@@ -105,7 +105,7 @@
13	#define AGL_API(type, name, args) AGL_##name##_t wgl##name = NULL;
14	# include "allegrogl/GLext/wgl_ext_api.h"
15	#undef AGL_API
16	-#elif defined ALLEGRO_LINUX
17	+#elif defined ALLEGRO_LINUX \|\| defined __FreeBSD__
18	#define AGL_API(type, name, args) AGL_##name##_t glX##name = NULL;
19	# include "allegrogl/GLext/glx_ext_api.h"
20	#undef AGL_API
21	@@ -153,7 +153,7 @@
22	if (ext->name) { AGL_LOG(2,"wgl" #name " successfully loaded\n"); }
23	# include "allegrogl/GLext/wgl_ext_api.h"
24	# undef AGL_API
25	-# elif defined ALLEGRO_LINUX
26	+# elif defined ALLEGRO_LINUX \|\| defined __FreeBSD__
27	# define AGL_API(type, name, args) \
28	ext->name = (AGL_##name##_t)aglXGetProcAddress("gl" #name); \
29	if (ext->name) { AGL_LOG(2,"gl" #name " successfully loaded\n"); }
30	@@ -197,7 +197,7 @@
31	#define AGL_API(type, name, args) wgl##name = ext->name;
32	# include "allegrogl/GLext/wgl_ext_api.h"
33	#undef AGL_API
34	-#elif defined ALLEGRO_LINUX
35	+#elif defined ALLEGRO_LINUX \|\| defined __FreeBSD__
36	#define AGL_API(type, name, args) glX##name = ext->name;
37	# include "allegrogl/GLext/glx_ext_api.h"
38	#undef AGL_API
39	@@ -344,7 +344,7 @@
40	* we try to find the symbol into the dynamic libs
41	* that are already loaded (e.g. in libGL.so)
42	*/
43	- symbol = dlsym(0, name);
44	+ symbol = dlsym(RTLD_NEXT, name);
45	}
46	#elif defined ALLEGRO_MACOSX
47	function = CFStringCreateWithCString(kCFAllocatorDefault, name,
48	@@ -439,10 +439,10 @@
49
50	/* Get glXGetProcAddress entry */
51	#ifdef ALLEGROGL_HAVE_DYNAMIC_LINK
52	- aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(0,
53	+ aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(RTLD_NEXT,
54	"glXGetProcAddressARB");
55	if (!aglXGetProcAddress) {
56	- aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(0,
57	+ aglXGetProcAddress = (GLXGETPROCADDRESSARBPROC) dlsym(RTLD_NEXT,
58	"glXGetProcAddress");
59	}
60	TRACE("glXGetProcAddress Extension: %s\n",

Lines 2-19 Link Here

(-)allegrogl/pkg-plist (-4 / +3 lines)
2	include/alleggl_config.h	2	include/alleggl_config.h
3	include/allegrogl/gl_ext.h	3	include/allegrogl/gl_ext.h
4	include/allegrogl/gl_header_detect.h	4	include/allegrogl/gl_header_detect.h
		5	include/allegrogl/GLext/gl_ext_alias.h
5	include/allegrogl/GLext/gl_ext_api.h	6	include/allegrogl/GLext/gl_ext_api.h
6	include/allegrogl/GLext/gl_ext_defs.h	7	include/allegrogl/GLext/gl_ext_defs.h
7	include/allegrogl/GLext/gl_ext_list.h	8	include/allegrogl/GLext/gl_ext_list.h
		9	include/allegrogl/GLext/glx_ext_alias.h
8	include/allegrogl/GLext/glx_ext_api.h	10	include/allegrogl/GLext/glx_ext_api.h
9	include/allegrogl/GLext/glx_ext_defs.h	11	include/allegrogl/GLext/glx_ext_defs.h
10	include/allegrogl/GLext/glx_ext_list.h	12	include/allegrogl/GLext/glx_ext_list.h
11	include/allegrogl/GLext/wgl_ext_api.h
12	include/allegrogl/GLext/wgl_ext_defs.h
13	include/allegrogl/GLext/wgl_ext_list.h
14	@dirrm include/allegrogl/GLext	13	@dirrm include/allegrogl/GLext
15	@dirrm include/allegrogl	14	@dirrm include/allegrogl
16	lib/libagl.a	15	lib/libagl.so
17	%%EXAMPLESDIR%%/demofont.dat	16	%%EXAMPLESDIR%%/demofont.dat
18	%%EXAMPLESDIR%%/dialog.c	17	%%EXAMPLESDIR%%/dialog.c
19	%%EXAMPLESDIR%%/dumbtest.c	18	%%EXAMPLESDIR%%/dumbtest.c