Attachment #201705 for bug #235477

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




# $FreeBSD$

PORTNAME=	allegro
DISTVERSION=	4.4.3
PORTREVISION=	8
CATEGORIES=	devel
MASTER_SITES=	https://github.com/liballeg/allegro5/releases/download/${DISTVERSION}/

MAINTAINER=	tobik@FreeBSD.org
COMMENT=	Cross-platform library for games and multimedia programming

LICENSE_FILE=	${WRKSRC}/docs/txt/license.txt
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

LIB_DEPENDS=	libpng.so:graphics/png \
		libogg.so:audio/libogg \
		libGLU>0:graphics/libGLU
LIB_DEPENDS=	libogg.so:audio/libogg \
		libvorbis.so:audio/libvorbis

USES=		cmake gl makeinfo pkgconfig
USE_GL=		gl glu
USE_XORG=	ice sm x11 xpm xext xcursor xxf86vm xxf86dga
USE_LDCONFIG=	yes


		${WRKSRC}/src/unix/jack.c

post-install:
	${INSTALL_MAN} ${INSTALL_WRKSRC}/docs/man/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/

post-install-EXAMPLES-on:
	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})

Lines 1-3 Link Here

(-)devel/allegro/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1483711950	1	TIMESTAMP = 1549257261
2	SHA256 (allegro-4.4.2.tar.gz) = 1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc	2	SHA256 (allegro-4.4.3.tar.gz) = 1e096e435e49e2dfd924d9c54ed7325caa1b06cecd28c3307146dd0de3d0bcb4
3	SIZE (allegro-4.4.2.tar.gz) = 4674902	3	SIZE (allegro-4.4.3.tar.gz) = 4759422




--- CMakeLists.txt.orig	2019-02-02 19:28:46 UTC
+++ CMakeLists.txt
@@ -66,7 +66,7 @@ if(WIN32)
 endif(WIN32)
 
 set(ALLEGRO_VERSION 4.4.3)
-string(REGEX MATCH "^[0-9]+[.][0-9]+" ALLEGRO_SOVERSION ${ALLEGRO_VERSION})
+string(REGEX MATCH "^[0-9]+" ALLEGRO_SOVERSION ${ALLEGRO_VERSION})
 
 # Mac OS X -compatibility_version.
 # XXX doesn't seem to work
@@ -403,6 +403,7 @@ option(WANT_OSS "Build OSS support" on)
 option(WANT_ALSA "Build ALSA support" on)
 option(WANT_JACK "Build JACK support" on)
 option(WANT_SGIAUDIO "Build SGI audio support" on)

 
 if(ALLEGRO_UNIX) # not MACOSX
     find_package(Threads)
@@ -465,6 +466,17 @@ if(ALLEGRO_UNIX) # not MACOSX
             add_our_module(alleg-sgialdigi src/unix/sgial.c audio)
         endif(SGIAUDIO_FOUND)
     endif(WANT_SGIAUDIO)
+
+    if(WANT_SNDIO)
+        find_path(SNDIO_INCLUDE_DIR sndio.h)
+        find_library(SNDIO_LIBRARY NAMES sndio)

+            add_our_module(alleg-sndiodigi src/unix/sndio.c ${SNDIO_LIBRARY})
+        endif(SNDIO_INCLUDE_DIR AND SNDIO_LIBRARY)
+    endif(WANT_SNDIO)
 
     # aRts is obsolete
     # esd is obsolete
 endif(ALLEGRO_UNIX)
@@ -961,7 +973,7 @@ if(UNIX)
             @ONLY
             )
         install(FILES ${LIBRARY_OUTPUT_PATH}/pkgconfig/${name}${lib_type}.pc
-                DESTINATION "lib${LIB_SUFFIX}/pkgconfig"
+                DESTINATION "libdata/pkgconfig"
                 )
     endforeach(name)
 endif(UNIX)




lib/liballeg.so
lib/liballeg.so.4
lib/liballeg.so.%%SHLIB_VER%%
lib/liballeggl.so
lib/liballeggl.so.4
lib/liballeggl.so.%%SHLIB_VER%%
lib/libjpgalleg.so
lib/libjpgalleg.so.4
lib/libjpgalleg.so.%%SHLIB_VER%%
lib/libloadpng.so
lib/libloadpng.so.4
lib/libloadpng.so.%%SHLIB_VER%%
lib/liblogg.so
lib/liblogg.so.4
lib/liblogg.so.%%SHLIB_VER%%
libdata/pkgconfig/allegro.pc
libdata/pkgconfig/allegrogl.pc
libdata/pkgconfig/jpgalleg.pc

Return to bug 235477

Lines 118-127 Link Here

(-)devel/allegro/pkg-plist (-4 / +12 lines)
118	lib/liballeg.so	118	lib/liballeg.so
119	lib/liballeg.so.4	119	lib/liballeg.so.4
120	lib/liballeg.so.%%SHLIB_VER%%	120	lib/liballeg.so.%%SHLIB_VER%%
121	lib/liballeggl.a	121	lib/liballeggl.so
122	lib/libjpgalleg.a	122	lib/liballeggl.so.4
123	lib/libloadpng.a	123	lib/liballeggl.so.%%SHLIB_VER%%
124	lib/liblogg.a	124	lib/libjpgalleg.so
		125	lib/libjpgalleg.so.4
		126	lib/libjpgalleg.so.%%SHLIB_VER%%
		127	lib/libloadpng.so
		128	lib/libloadpng.so.4
		129	lib/libloadpng.so.%%SHLIB_VER%%
		130	lib/liblogg.so
		131	lib/liblogg.so.4
		132	lib/liblogg.so.%%SHLIB_VER%%
125	libdata/pkgconfig/allegro.pc	133	libdata/pkgconfig/allegro.pc
126	libdata/pkgconfig/allegrogl.pc	134	libdata/pkgconfig/allegrogl.pc
127	libdata/pkgconfig/jpgalleg.pc	135	libdata/pkgconfig/jpgalleg.pc

Lines 2-11 Link Here

(-)devel/allegro/Makefile (-9 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= allegro	4	PORTNAME= allegro
5	DISTVERSION= 4.4.2	5	DISTVERSION= 4.4.3
6	PORTREVISION= 8
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= SF/alleg/allegro/${PORTVERSION}	7	MASTER_SITES= https://github.com/liballeg/allegro5/releases/download/${DISTVERSION}/
9		8
10	MAINTAINER= tobik@FreeBSD.org	9	MAINTAINER= tobik@FreeBSD.org
11	COMMENT= Cross-platform library for games and multimedia programming	10	COMMENT= Cross-platform library for games and multimedia programming
Lines 15-27 Link Here
15	LICENSE_FILE= ${WRKSRC}/docs/txt/license.txt	14	LICENSE_FILE= ${WRKSRC}/docs/txt/license.txt
16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	15	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
17		16
18	# Required for building libloadpng.a and liballeggl.a	17	LIB_DEPENDS= libpng.so:graphics/png \
19	BUILD_DEPENDS= png>0:graphics/png \	18	libogg.so:audio/libogg \
20	libGLU>0:graphics/libGLU
21	LIB_DEPENDS= libogg.so:audio/libogg \
22	libvorbis.so:audio/libvorbis	19	libvorbis.so:audio/libvorbis
23		20
24	USES= cmake:insource makeinfo pkgconfig	21	USES= cmake gl makeinfo pkgconfig
		22	USE_GL= gl glu
25	USE_XORG= ice sm x11 xpm xext xcursor xxf86vm xxf86dga	23	USE_XORG= ice sm x11 xpm xext xcursor xxf86vm xxf86dga
26	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
27		25
Lines 69-75 Link Here
69	${WRKSRC}/src/unix/jack.c	67	${WRKSRC}/src/unix/jack.c
70		68
71	post-install:	69	post-install:
72	${INSTALL_MAN} ${WRKSRC}/docs/man/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/	70	${INSTALL_MAN} ${INSTALL_WRKSRC}/docs/man/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
73		71
74	post-install-EXAMPLES-on:	72	post-install-EXAMPLES-on:
75	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})	73	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})

Lines 1-15 Link Here

(-)devel/allegro/files/patch-CMakeLists.txt (-17 / +8 lines)
1	--- CMakeLists.txt.orig 2011-03-24 23:18:50 UTC	1	--- CMakeLists.txt.orig 2019-02-02 19:28:46 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -66,7 +66,7 @@ if(WIN32)	3	@@ -66,7 +66,7 @@ if(WIN32)
4	endif(WIN32)	4	endif(WIN32)
5		5
6	set(ALLEGRO_VERSION 4.4.2)	6	set(ALLEGRO_VERSION 4.4.3)
7	-string(REGEX MATCH "^[0-9]+[.][0-9]+" ALLEGRO_SOVERSION ${ALLEGRO_VERSION})	7	-string(REGEX MATCH "^[0-9]+[.][0-9]+" ALLEGRO_SOVERSION ${ALLEGRO_VERSION})
8	+string(REGEX MATCH "^[0-9]" ALLEGRO_SOVERSION ${ALLEGRO_VERSION})	8	+string(REGEX MATCH "^[0-9]+" ALLEGRO_SOVERSION ${ALLEGRO_VERSION})
9		9
10	# Mac OS X -compatibility_version.	10	# Mac OS X -compatibility_version.
11	# XXX doesn't seem to work	11	# XXX doesn't seem to work
12	@@ -408,6 +408,7 @@ option(WANT_OSS "Build OSS support" on)	12	@@ -403,6 +403,7 @@ option(WANT_OSS "Build OSS support" on)
13	option(WANT_ALSA "Build ALSA support" on)	13	option(WANT_ALSA "Build ALSA support" on)
14	option(WANT_JACK "Build JACK support" on)	14	option(WANT_JACK "Build JACK support" on)
15	option(WANT_SGIAUDIO "Build SGI audio support" on)	15	option(WANT_SGIAUDIO "Build SGI audio support" on)
Lines 17-26 Link Here
17		17
18	if(ALLEGRO_UNIX) # not MACOSX	18	if(ALLEGRO_UNIX) # not MACOSX
19	find_package(Threads)	19	find_package(Threads)
20	@@ -471,6 +472,17 @@ if(ALLEGRO_UNIX) # not MACOSX	20	@@ -465,6 +466,17 @@ if(ALLEGRO_UNIX) # not MACOSX
		21	add_our_module(alleg-sgialdigi src/unix/sgial.c audio)
21	endif(SGIAUDIO_FOUND)	22	endif(SGIAUDIO_FOUND)
22	endif(WANT_SGIAUDIO)	23	endif(WANT_SGIAUDIO)
23		24	+
24	+ if(WANT_SNDIO)	25	+ if(WANT_SNDIO)
25	+ find_path(SNDIO_INCLUDE_DIR sndio.h)	26	+ find_path(SNDIO_INCLUDE_DIR sndio.h)
26	+ find_library(SNDIO_LIBRARY NAMES sndio)	27	+ find_library(SNDIO_LIBRARY NAMES sndio)
Lines 31-46 Link Here
31	+ add_our_module(alleg-sndiodigi src/unix/sndio.c ${SNDIO_LIBRARY})	32	+ add_our_module(alleg-sndiodigi src/unix/sndio.c ${SNDIO_LIBRARY})
32	+ endif(SNDIO_INCLUDE_DIR AND SNDIO_LIBRARY)	33	+ endif(SNDIO_INCLUDE_DIR AND SNDIO_LIBRARY)
33	+ endif(WANT_SNDIO)	34	+ endif(WANT_SNDIO)
34	+	35
35	# aRts is obsolete	36	# aRts is obsolete
36	# esd is obsolete	37	# esd is obsolete
37	endif(ALLEGRO_UNIX)
38	@@ -961,7 +973,7 @@ if(UNIX)
39	@ONLY
40	)
41	install(FILES ${LIBRARY_OUTPUT_PATH}/pkgconfig/${name}${lib_type}.pc
42	- DESTINATION "lib${LIB_SUFFIX}/pkgconfig"
43	+ DESTINATION "libdata/pkgconfig"
44	)
45	endforeach(name)
46	endif(UNIX)