Attachment #135872 for bug #180909

Lines 2-37 Link Here

(-)./Makefile (-14 / +94 lines)
2		2
3	PORTNAME= allegro	3	PORTNAME= allegro
4	DISTVERSION= 4.4.2	4	DISTVERSION= 4.4.2
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= SF/alleg/allegro/${PORTVERSION}	7	MASTER_SITES= SF/alleg/allegro/${PORTVERSION}
		8	DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
		9	DIST_SUBDIR= ${PORTNAME}
		10	EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
8		11
9	MAINTAINER= nemysis@gmx.ch	12	MAINTAINER= nemysis@gmx.ch
10	COMMENT= Cross-platform library for games and multimedia programming	13	COMMENT= Cross-platform library for games and multimedia programming
11		14
12	USE_GMAKE= yes	15	LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
		16
13	USES= cmake pkgconfig	17	USES= cmake pkgconfig
14	USE_XORG= x11 xpm xext xcursor xxf86vm xxf86dga	18	USE_XORG= x11 xpm xext xcursor xxf86vm xxf86dga
15	USE_LDCONFIG= yes
16	WANT_GNOME= yes
17	USE_GL= gl glu	19	USE_GL= gl glu
		20	USE_LDCONFIG= yes
		21	MAKE_JOBS_SAFE= yes
18		22
19	MAKE_JOBS_UNSAFE= yes	23	CFLAGS+= -L${LOCALBASE}/lib
20		24
21	PORTDOCS= *	25	PORTDOCS= *
		26	PORTEXAMPLES= *
22		27
23	CONFLICTS= allegro-devel-[0-9]*	28	PLIST_SUB+= SHLIB_VER="${SHLIB_VER}"
24	PLIST_SUB= SHLIB_VER="${SHLIB_VER}"
25	CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}"	29	CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}"
26		30
27	SHLIB_VER= 4.4.2	31	SHLIB_VER= ${PORTVERSION}
28		32
29	PORTSCOUT= limit:^4\.3\.[0-9]*	33	# Wrong versioning upstream
		34	PORTSCOUT= ignore:1
30		35
31	CFLAGS+= -L${LOCALBASE}/lib	36	OPTIONS_DEFINE= DOCS ALSA JACK OGG
32	LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib \	37	OPTIONS_GROUP= EXAMPLES_DEMOS
33	jack.0:${PORTSDIR}/audio/jack \	38	OPTIONS_GROUP_EXAMPLES_DEMOS= EXAMPLES DEMOS
34	png15:${PORTSDIR}/graphics/png	39	OPTIONS_DEFAULT= DEMOS ALSA OGG
		40	DEMOS_DESC= Install Demos programs, requires EXAMPLES
		41
		42	OPTIONS_SUB= yes
		43
		44	DOCSRCDIR1= ${WRKSRC}
		45	DOC_FILES1= AUTHORS CHANGES THANKS readme.txt
		46
		47	DOCSRCDIR2= ${WRKSRC}/docs
		48	DOCSDIR2= ${DOCSDIR}/docs
35		49
36	.include <bsd.port.options.mk>	50	.include <bsd.port.options.mk>
37		51
Lines 40-48 Link Here
40	INFO= allegro	54	INFO= allegro
41	.endif	55	.endif
42		56
		57	.if ${PORT_OPTIONS:MEXAMPLES}
		58	CMAKE_ARGS+=-DWANT_EXAMPLES=on
		59	.else
		60	CMAKE_ARGS+=-DWANT_EXAMPLES=off
		61	.endif
		62
		63	.if ${PORT_OPTIONS:MALSA}
		64	LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
		65	CMAKE_ARGS+=-DWANT_ALSA=on
		66	.else
		67	CMAKE_ARGS+=-DWANT_ALSA=off
		68	.endif
		69
		70	.if ${PORT_OPTIONS:MJACK}
		71	LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
		72	CMAKE_ARGS+=-DWANT_JACK=on
		73	.else
		74	CMAKE_ARGS+=-DWANT_JACK=off
		75	.endif
		76
		77	.if ${PORT_OPTIONS:MOGG}
		78	LIB_DEPENDS+= ogg:${PORTSDIR}/audio/libogg
		79	CMAKE_ARGS+=-DWANT_LOGG=on
		80	.else
		81	CMAKE_ARGS+=-DWANT_LOGG=off
		82	.endif
		83
		84	.if ${PORT_OPTIONS:MDEMOS} && ${PORT_OPTIONS:MEXAMPLES}
		85	SUB_FILES+= shooter skater skater_agl \
		86	pkg-message
		87	MASTER_SITES+= SF/nemysisfreebsdp/allegro/:icons
		88	DISTFILES+= shooter.png:icons \
		89	skater.png:icons
		90	DESKTOP_ENTRIES+="Shooter" "In a distant corner of the galaxy" "shooter" \
		91	"shooter" "Game;ArcadeGame;" false
		92	DESKTOP_ENTRIES+="Skater" "Allegro's next demo game" "skater" \
		93	"skater" "Game;ArcadeGame;" false
		94	DESKTOP_ENTRIES+="Skater AGL" "Allegro's next demo game" "skater" \
		95	"skater_agl" "Game;ArcadeGame;" false
		96	.endif
		97
43	post-patch:	98	post-patch:
		99	@${REINPLACE_CMD} -e 's\|/allegro-$${ALLEGRO_VERSION}\|\|' \
		100	${WRKSRC}/docs/CMakeLists.txt
		101	@${REINPLACE_CMD} -e 's\|<X11/extensions/xf86dga.h>\|<X11/extensions/Xxf86dga.h>\|' \
		102	${WRKSRC}/src/x/xdga2.c
		103	.if ${PORT_OPTIONS:MJACK}
		104	@${REINPLACE_CMD} -e 's\|jack_client = jack_client_new(jack_client_name);\|jack_client = jack_client_open(jack_client_name, (jack_options_t)0, NULL);\|' \
		105	${WRKSRC}/src/unix/jack.c
		106	.endif
44	.if ! ${PORT_OPTIONS:MDOCS}	107	.if ! ${PORT_OPTIONS:MDOCS}
45	@${REINPLACE_CMD} -e 's\|add_subdirectory(docs)\|#add_subdirectory(docs)\|' ${WRKSRC}/CMakeLists.txt	108	@${REINPLACE_CMD} -e 's\|add_subdirectory(docs)\|#add_subdirectory(docs)\|' \
		109	${WRKSRC}/CMakeLists.txt
46	.endif	110	.endif
47		111
48	post-install:	112	post-install:
Lines 51-54 Link Here
51	${FIND} . -type f -and -name "*.3" -exec ${INSTALL_MAN} {} ${PREFIX}/man/man3/{} \;	115	${FIND} . -type f -and -name "*.3" -exec ${INSTALL_MAN} {} ${PREFIX}/man/man3/{} \;
52	.endif	116	.endif
53		117
		118	.if ${PORT_OPTIONS:MEXAMPLES}
		119	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
		120	.endif
		121
		122	.if ${PORT_OPTIONS:MDEMOS} && ${PORT_OPTIONS:MEXAMPLES}
		123	@(cd ${WRKSRC} && ${COPYTREE_SHARE} demos ${EXAMPLESDIR})
		124	${INSTALL_SCRIPT} ${WRKDIR}/shooter ${PREFIX}/bin
		125	${INSTALL_DATA} ${_DISTDIR}/shooter.png ${PREFIX}/share/pixmaps
		126	@(cd ${EXAMPLESDIR}/demos/shooter && ${CHMOD} 755 shooter)
		127	${INSTALL_SCRIPT} ${WRKDIR}/skater* ${PREFIX}/bin
		128	${INSTALL_DATA} ${_DISTDIR}/skater.png ${PREFIX}/share/pixmaps
		129	@(cd ${EXAMPLESDIR}/demos/skater && ${CHMOD} 755 skater*)
		130	@${ECHO_CMD}
		131	@${CAT} ${PKGMESSAGE}
		132	@${ECHO_CMD}
		133	.endif
54	.include <bsd.port.mk>	134	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +6 lines)
1	SHA256 (allegro-4.4.2.tar.gz) = 1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc	1	SHA256 (allegro/allegro-4.4.2.tar.gz) = 1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc
2	SIZE (allegro-4.4.2.tar.gz) = 4674902	2	SIZE (allegro/allegro-4.4.2.tar.gz) = 4674902
		3	SHA256 (allegro/shooter.png) = cf73f63f0224a9ee77c287b6211beb4a072ba4aa969a57993e60a2e97996e468
		4	SIZE (allegro/shooter.png) = 1741
		5	SHA256 (allegro/skater.png) = f0274627c6eae2ecad880c3e2f25bf5f8944f08829ac32ab0a00f77001e8b2f3
		6	SIZE (allegro/skater.png) = 3395

Lines 1-11 Link Here

(-)./files/patch-docs_CMakeLists.txt (-11 lines)
1	--- docs/CMakeLists.txt.orig 2010-12-15 13:29:42.000000000 +0600
2	+++ docs/CMakeLists.txt 2010-12-15 13:29:49.000000000 +0600
3	@@ -9,7 +9,7 @@
4	endif()
5
6	set(DOCDIR "doc" CACHE STRING "Install docs into $DOCDIR/allegro-$VERSION")
7	-set(ACTUAL_DOC_DIR "${DOCDIR}/allegro-${ALLEGRO_VERSION}")
8	+set(ACTUAL_DOC_DIR "${DOCDIR}")
9
10	add_executable(makedoc
11	src/makedoc/makedoc.c




--- src/x/xkeyboard.c.orig	2010-12-08 09:13:50.000000000 +0100
+++ src/x/xkeyboard.c	2013-07-28 00:17:52.000000000 +0200
@@ -23,6 +23,7 @@
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/XKBlib.h>
 #include <X11/Xproto.h>
 
 #include "allegro.h"
@@ -617,7 +618,7 @@
 
       TRACE (PREFIX_I "Modifier %d:", i + 1);
       for (j = 0; j < xmodmap->max_keypermod; j++) {
-	 KeySym sym = XKeycodeToKeysym(_xwin.display,
+	 KeySym sym = XkbKeycodeToKeysym(_xwin.display, 0,
 	    xmodmap->modifiermap[i * xmodmap->max_keypermod + j], 0);
          char *sym_str = XKeysymToString(sym);
          TRACE(" %s", sym_str ? sym_str : "NULL");




===============================================================================

Allegro has been installed.

Allegro have two Demos (Games)

Shooter and Skater


You can use executable

    %%LOCALBASE%%/bin/shooter

    %%LOCALBASE%%/bin/skater


Or can use desktop files

    %%LOCALBASE%%/share/applications/shooter.desktop

    %%LOCALBASE%%/share/applications/skater.desktop

Have fun!

===============================================================================

Line 0 Link Here

(-)./files/shooter.in (+7 lines)
	1	#!/bin/sh
	2	#
	3	# # $FreeBSD$
	4	#
	5
	6	cd "%%EXAMPLESDIR%%/demos/shooter"
	7	exec ./shooter "${@}"

Line 0 Link Here

(-)./files/skater.in (+7 lines)
	1	#!/bin/sh
	2	#
	3	# # $FreeBSD$
	4	#
	5
	6	cd "%%EXAMPLESDIR%%/demos/skater"
	7	exec ./skater "${@}"

Line 0 Link Here

(-)./files/skater_agl.in (+7 lines)
	1	#!/bin/sh
	2	#
	3	# # $FreeBSD$
	4	#
	5
	6	cd "%%EXAMPLESDIR%%/demos/skater"
	7	exec ./skater_agl "${@}"

Lines 8-13 Link Here

(-)./pkg-plist (-5 / +10 lines)
8	bin/pack	8	bin/pack
9	bin/pat2dat	9	bin/pat2dat
10	bin/rgbmap	10	bin/rgbmap
		11	%%DEMOS%%bin/shooter
		12	%%DEMOS%%bin/skater
		13	%%DEMOS%%bin/skater_agl
11	bin/textconv	14	bin/textconv
12	include/alleggl.h	15	include/alleggl.h
13	include/allegro.h	16	include/allegro.h
Lines 113-124 Link Here
113	include/allegrogl/gl_header_detect.h	116	include/allegrogl/gl_header_detect.h
114	include/jpgalleg.h	117	include/jpgalleg.h
115	include/loadpng.h	118	include/loadpng.h
116	include/logg.h	119	%%OGG%%include/logg.h
117	include/xalleg.h	120	include/xalleg.h
118	lib/allegro/%%SHLIB_VER%%/alleg-alsadigi.so	121	%%ALSA%%lib/allegro/%%SHLIB_VER%%/alleg-alsadigi.so
119	lib/allegro/%%SHLIB_VER%%/alleg-alsamidi.so	122	%%ALSA%%lib/allegro/%%SHLIB_VER%%/alleg-alsamidi.so
120	lib/allegro/%%SHLIB_VER%%/alleg-dga2.so	123	lib/allegro/%%SHLIB_VER%%/alleg-dga2.so
121	lib/allegro/%%SHLIB_VER%%/alleg-jack.so	124	%%JACK%%lib/allegro/%%SHLIB_VER%%/alleg-jack.so
122	lib/allegro/%%SHLIB_VER%%/modules.lst	125	lib/allegro/%%SHLIB_VER%%/modules.lst
123	lib/liballeg.so	126	lib/liballeg.so
124	lib/liballeg.so.4	127	lib/liballeg.so.4
Lines 126-137 Link Here
126	lib/liballeggl.a	129	lib/liballeggl.a
127	lib/libjpgalleg.a	130	lib/libjpgalleg.a
128	lib/libloadpng.a	131	lib/libloadpng.a
129	lib/liblogg.a	132	%%OGG%%lib/liblogg.a
130	libdata/pkgconfig/allegro.pc	133	libdata/pkgconfig/allegro.pc
131	libdata/pkgconfig/allegrogl.pc	134	libdata/pkgconfig/allegrogl.pc
132	libdata/pkgconfig/jpgalleg.pc	135	libdata/pkgconfig/jpgalleg.pc
133	libdata/pkgconfig/loadpng.pc	136	libdata/pkgconfig/loadpng.pc
134	libdata/pkgconfig/logg.pc	137	libdata/pkgconfig/logg.pc
		138	%%DEMOS%%share/pixmaps/shooter.png
		139	%%DEMOS%%share/pixmaps/skater.png
135	@dirrm lib/allegro/%%SHLIB_VER%%	140	@dirrm lib/allegro/%%SHLIB_VER%%
136	@dirrm lib/allegro	141	@dirrm lib/allegro
137	@dirrm include/allegrogl/GLext	142	@dirrm include/allegrogl/GLext

Return to bug 180909

Line 0 Link Here

(-)./files/patch-src-x-xkeyboard.c (+19 lines)
	1	--- src/x/xkeyboard.c.orig 2010-12-08 09:13:50.000000000 +0100
	2	+++ src/x/xkeyboard.c 2013-07-28 00:17:52.000000000 +0200
	3	@@ -23,6 +23,7 @@
	4	#include <X11/Xos.h>
	5	#include <X11/Xlib.h>
	6	#include <X11/Xutil.h>
	7	+#include <X11/XKBlib.h>
	8	#include <X11/Xproto.h>
	9
	10	#include "allegro.h"
	11	@@ -617,7 +618,7 @@
	12
	13	TRACE (PREFIX_I "Modifier %d:", i + 1);
	14	for (j = 0; j < xmodmap->max_keypermod; j++) {
	15	- KeySym sym = XKeycodeToKeysym(_xwin.display,
	16	+ KeySym sym = XkbKeycodeToKeysym(_xwin.display, 0,
	17	xmodmap->modifiermap[i * xmodmap->max_keypermod + j], 0);
	18	char *sym_str = XKeysymToString(sym);
	19	TRACE(" %s", sym_str ? sym_str : "NULL");

Line 0 Link Here

(-)./files/pkg-message.in (+25 lines)
	1	===============================================================================
	2
	3	Allegro has been installed.
	4
	5	Allegro have two Demos (Games)
	6
	7	Shooter and Skater
	8
	9
	10	You can use executable
	11
	12	%%LOCALBASE%%/bin/shooter
	13
	14	%%LOCALBASE%%/bin/skater
	15
	16
	17	Or can use desktop files
	18
	19	%%LOCALBASE%%/share/applications/shooter.desktop
	20
	21	%%LOCALBASE%%/share/applications/skater.desktop
	22
	23	Have fun!
	24
	25	===============================================================================