diff options
author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-03-09 08:07:31 +0000 |
---|---|---|
committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-03-09 08:07:31 +0000 |
commit | feb6abd72feda2eac6008790332f1ed4dac824ae (patch) | |
tree | 59258d7af4c57e1893b6a11ab2f6447d782ee83d /devel/allegro | |
parent | 4e4c470b3141799530fd74b5025ab72ef81095c2 (diff) | |
download | ports-feb6abd72feda2eac6008790332f1ed4dac824ae.tar.gz ports-feb6abd72feda2eac6008790332f1ed4dac824ae.zip |
devel/allegro: Update to 4.4.3.1
Some static libraries are now built as shared libraries. Bump
revision of consumers.
Changes: https://github.com/liballeg/allegro5/blob/4.4.3.1/docs/src/changes._tx
Changes: https://github.com/liballeg/allegro5/compare/4.4.2...4.4.3.1
PR: 235477
Notes
Notes:
svn path=/head/; revision=495105
Diffstat (limited to 'devel/allegro')
-rw-r--r-- | devel/allegro/Makefile | 29 | ||||
-rw-r--r-- | devel/allegro/distinfo | 6 | ||||
-rw-r--r-- | devel/allegro/files/patch-CMakeLists.txt | 28 | ||||
-rw-r--r-- | devel/allegro/pkg-plist | 16 |
4 files changed, 42 insertions, 37 deletions
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile index a2bc9bf68690..cc52b6fe275a 100644 --- a/devel/allegro/Makefile +++ b/devel/allegro/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= allegro -DISTVERSION= 4.4.2 -PORTREVISION= 8 +DISTVERSION= 4.4.3.1 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,31 +14,29 @@ LICENSE_NAME= Giftware 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 \ + libpng.so:graphics/png \ libvorbis.so:audio/libvorbis -USES= cmake:insource makeinfo pkgconfig -USE_XORG= ice sm x11 xpm xext xcursor xxf86vm xxf86dga +USES= cmake gl makeinfo pkgconfig +USE_GL= gl glu +USE_XORG= ice sm x11 xcursor xext xpm xxf86dga xxf86vm USE_LDCONFIG= yes INFO= allegro PORTDOCS= * PORTEXAMPLES= * -PLIST_SUB= SHLIB_VER="${PORTVERSION}" -CMAKE_ARGS= -DDOCDIR="${DOCSDIR}" \ - -DWANT_MODULES=off \ - -DWANT_LOGG=on \ - -DWANT_EXAMPLES=off +PLIST_SUB= SHLIB_VER="${PORTVERSION:R}" +CMAKE_ARGS= -DDOCDIR="${DOCSDIR}" +CMAKE_OFF= WANT_EXAMPLES WANT_MODULES +CMAKE_ON= WANT_LOGG # Wrong versioning upstream PORTSCOUT= ignore:1 -OPTIONS_DEFINE= EXAMPLES DOCS -OPTIONS_MULTI= AUDIO +OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_MULTI= AUDIO OPTIONS_MULTI_AUDIO= ALSA JACK OSS SNDIO OPTIONS_DEFAULT= OSS @@ -69,7 +66,7 @@ post-patch-JACK-on: ${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}) diff --git a/devel/allegro/distinfo b/devel/allegro/distinfo index f59baac95a26..cf82a73302bf 100644 --- a/devel/allegro/distinfo +++ b/devel/allegro/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483711950 -SHA256 (allegro-4.4.2.tar.gz) = 1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc -SIZE (allegro-4.4.2.tar.gz) = 4674902 +TIMESTAMP = 1552112646 +SHA256 (allegro-4.4.3.1.tar.gz) = ec19dbc9a021244582b4819b3583ee594b50141f9fcf6944a4ed8069cbf8d4d4 +SIZE (allegro-4.4.3.1.tar.gz) = 4663634 diff --git a/devel/allegro/files/patch-CMakeLists.txt b/devel/allegro/files/patch-CMakeLists.txt index 61cbec685166..60aa6b11cbe7 100644 --- a/devel/allegro/files/patch-CMakeLists.txt +++ b/devel/allegro/files/patch-CMakeLists.txt @@ -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,7 +17,7 @@ if(ALLEGRO_UNIX) # not MACOSX find_package(Threads) -@@ -471,6 +472,17 @@ if(ALLEGRO_UNIX) # not MACOSX +@@ -466,6 +467,17 @@ if(ALLEGRO_UNIX) # not MACOSX endif(SGIAUDIO_FOUND) endif(WANT_SGIAUDIO) @@ -35,12 +35,12 @@ # 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) +@@ -744,7 +756,7 @@ endif(BEOS) + + # On Unix/Mac we don't ever use a -static postfix. + if(CMAKE_BUILD_TYPE STREQUAL Debug) +- set(BUILD_TYPE_SUFFIX -debug) ++ set(BUILD_TYPE_SUFFIX "") + elseif(CMAKE_BUILD_TYPE STREQUAL Profile) + set(BUILD_TYPE_SUFFIX -profile) + else() diff --git a/devel/allegro/pkg-plist b/devel/allegro/pkg-plist index 7a1a25ecdb21..e8c5a5dd301d 100644 --- a/devel/allegro/pkg-plist +++ b/devel/allegro/pkg-plist @@ -118,10 +118,18 @@ include/xalleg.h 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 |