Attachment 201705 Details for Bug 235477 – allegro.diff

[patch] allegro.diff

allegro.diff (text/plain), 4.61 KB, created by Tobias Kortkamp on 2019-02-04 06:43:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2019-02-04 06:43:52 UTC

Size: 4.61 KB

patch

obsolete

>Index: devel/allegro/Makefile
>===================================================================
>--- devel/allegro/Makefile	(revision 491945)
>+++ devel/allegro/Makefile	(working copy)
>@@ -2,10 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	allegro
>-DISTVERSION=	4.4.2
>-PORTREVISION=	8
>+DISTVERSION=	4.4.3
> CATEGORIES=	devel
>-MASTER_SITES=	SF/alleg/allegro/${PORTVERSION}
>+MASTER_SITES=	https://github.com/liballeg/allegro5/releases/download/${DISTVERSION}/
> 
> MAINTAINER=	tobik@FreeBSD.org
> COMMENT=	Cross-platform library for games and multimedia programming
>@@ -15,13 +14,12 @@
> LICENSE_FILE=	${WRKSRC}/docs/txt/license.txt
> LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>-# Required for building libloadpng.a and liballeggl.a
>-BUILD_DEPENDS=	png>0:graphics/png \
>-		libGLU>0:graphics/libGLU
>-LIB_DEPENDS=	libogg.so:audio/libogg \
>+LIB_DEPENDS=	libpng.so:graphics/png \
>+		libogg.so:audio/libogg \
> 		libvorbis.so:audio/libvorbis
> 
>-USES=		cmake:insource makeinfo pkgconfig
>+USES=		cmake gl makeinfo pkgconfig
>+USE_GL=		gl glu
> USE_XORG=	ice sm x11 xpm xext xcursor xxf86vm xxf86dga
> USE_LDCONFIG=	yes
> 
>@@ -69,7 +67,7 @@
> 		${WRKSRC}/src/unix/jack.c
> 
> post-install:
>-	${INSTALL_MAN} ${WRKSRC}/docs/man/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
>+	${INSTALL_MAN} ${INSTALL_WRKSRC}/docs/man/*.3 ${STAGEDIR}${MAN3PREFIX}/man/man3/
> 
> post-install-EXAMPLES-on:
> 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
>Index: devel/allegro/distinfo
>===================================================================
>--- devel/allegro/distinfo	(revision 491945)
>+++ devel/allegro/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1483711950
>-SHA256 (allegro-4.4.2.tar.gz) = 1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc
>-SIZE (allegro-4.4.2.tar.gz) = 4674902
>+TIMESTAMP = 1549257261
>+SHA256 (allegro-4.4.3.tar.gz) = 1e096e435e49e2dfd924d9c54ed7325caa1b06cecd28c3307146dd0de3d0bcb4
>+SIZE (allegro-4.4.3.tar.gz) = 4759422
>Index: devel/allegro/files/patch-CMakeLists.txt
>===================================================================
>--- devel/allegro/files/patch-CMakeLists.txt	(revision 491945)
>+++ devel/allegro/files/patch-CMakeLists.txt	(working copy)
>@@ -1,15 +1,15 @@
>---- CMakeLists.txt.orig	2011-03-24 23:18:50 UTC
>+--- 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.2)
>+ 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})
>++string(REGEX MATCH "^[0-9]+" ALLEGRO_SOVERSION ${ALLEGRO_VERSION})
>  
>  # Mac OS X -compatibility_version.
>  # XXX doesn't seem to work
>-@@ -408,6 +408,7 @@ option(WANT_OSS "Build OSS support" on)
>+@@ -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)
>@@ -17,10 +17,11 @@
>  
>  if(ALLEGRO_UNIX) # not MACOSX
>      find_package(Threads)
>-@@ -471,6 +472,17 @@ if(ALLEGRO_UNIX) # not MACOSX
>+@@ -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)
>@@ -31,16 +32,6 @@
> +            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)
>Index: devel/allegro/pkg-plist
>===================================================================
>--- devel/allegro/pkg-plist	(revision 491945)
>+++ devel/allegro/pkg-plist	(working copy)
>@@ -118,10 +118,18 @@
> lib/liballeg.so
> lib/liballeg.so.4
> lib/liballeg.so.%%SHLIB_VER%%
>-lib/liballeggl.a
>-lib/libjpgalleg.a
>-lib/libloadpng.a
>-lib/liblogg.a
>+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

Flags:

tobik: maintainer-approval+

Actions: View | Diff

Attachments on bug 235477: 201705