Date: Thu, 22 Aug 2019 17:20:56 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509618 - head/devel/allegro-devel Message-ID: <201908221720.x7MHKuCa081706@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Aug 22 17:20:56 2019 New Revision: 509618 URL: https://svnweb.freebsd.org/changeset/ports/509618 Log: - Modernize and simplify the port - Disable ALSA by default, as judging by demos it leads to instant crash at startup. OSS sound work just fine - Update WWW Modified: head/devel/allegro-devel/Makefile head/devel/allegro-devel/pkg-descr Modified: head/devel/allegro-devel/Makefile ============================================================================== --- head/devel/allegro-devel/Makefile Thu Aug 22 17:20:45 2019 (r509617) +++ head/devel/allegro-devel/Makefile Thu Aug 22 17:20:56 2019 (r509618) @@ -3,7 +3,7 @@ PORTNAME= allegro DISTVERSION= 5.0.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MASTER_SITES= SF/alleg/allegro/${PORTVERSION} PKGNAMESUFFIX= -devel @@ -17,75 +17,62 @@ COMMENT= Cross-platform library for games and multimed LICENSE= ZLIB BSD3CLAUSE LICENSE_COMB= dual -LIB_DEPENDS+= libjack.so:audio/jack \ +LIB_DEPENDS= libjack.so:audio/jack \ libpng.so:graphics/png \ libvorbis.so:audio/libvorbis \ libFLAC.so:audio/flac \ libphysfs.so:devel/physfs -USES= cmake:insource compiler:c++11-lang jpeg openal:soft pkgconfig +USES= cmake:insource compiler:c++11-lang gl gnome jpeg \ + openal:soft pkgconfig USE_XORG= x11 xpm xext xcursor xxf86vm xxf86dga USE_GL= glu USE_GNOME= gtk20 USE_LDCONFIG= yes -PLIST_SUB+= SHLIB_VER="${SHLIB_VER}" -PLIST_SUB+= SHLIB_VER1="${SHLIB_VER1}" +CFLAGS+= -isystem${LOCALBASE}/include -L${LOCALBASE}/lib -SHLIB_VER= ${PORTVERSION} -SHLIB_VER1= ${PORTVERSION:R} +PLIST_SUB= SHLIB_VER="${PORTVERSION}" SHLIB_VER1="${PORTVERSION:R}" -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib - # Wrong versioning upstream PORTSCOUT= limitw:1,even skipv:5.0.10 -OPTIONS_DEFINE= ALSA DOCS PULSEAUDIO -OPTIONS_GROUP= DEMOS_EXAMPLES -OPTIONS_GROUP_DEMOS_EXAMPLES= DEMOS EXAMPLES -OPTIONS_DEFAULT= ALSA DEMOS -DEMOS_DESC= Install Demos programs, requires EXAMPLES - PORTDOCS= * PORTEXAMPLES= * DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX} -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= README.txt +OPTIONS_DEFINE= ALSA DOCS EXAMPLES PULSEAUDIO DEMOS +OPTIONS_DEFAULT= DEMOS +OPTIONS_SUB= yes -DOCSRCDIR2= ${WRKSRC}/docs -DOCSDIR2= ${DOCSDIR}/docs - -OPTIONS_SUB= yes - DOCS_BUILD_DEPENDS= ${LOCALBASE}/bin/pandoc:textproc/hs-pandoc ALSA_LIB_DEPENDS= libasound.so.2:audio/alsa-lib -ALSA_CMAKE_ON= -DWANT_ALSA=on -ALSA_CMAKE_OFF= -DWANT_ALSA=off -DEMOS_IMPLIES= EXAMPLES +ALSA_CMAKE_BOOL= WANT_ALSA +ALSA_BROKEN= ALSA support is broken # confirmed by running demos, leads to assertion at startup +DEMOS_IMPLIES= EXAMPLES PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_CMAKE_ON= -DWANT_PULSEAUDIO=on -PULSEAUDIO_CMAKE_OFF= -DWANT_PULSEAUDIO=off +PULSEAUDIO_CMAKE_BOOL= WANT_PULSEAUDIO -.include <bsd.port.options.mk> +DEMOS_DESC= Install demo programs +DEMOS_CMAKE_BOOL= WANT_DEMO +DEMOS_SUB_FILES= cosmic_protector speed pkg-message +DEMOS_MASTER_SITES= SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:icons +DEMOS_DISTFILES= cosmic_protector.png:icons speed.png:icons +DEMOS_DESKTOP_ENTRIES= "Cosmic Protector" \ + "Protect the earth from a deadly meteor shower" \ + "cosmic_protector" \ + "cosmic_protector" \ + "Game;ArcadeGame;" \ + "" \ + "SPEED" \ + "Simultaneous Projections Employing an Ensemble of Displays" \ + "speed" \ + "speed" \ + "Game;ArcadeGame;" \ + "" -.if ${PORT_OPTIONS:MDEMOS} && ${PORT_OPTIONS:MEXAMPLES} -CMAKE_ARGS+=-DWANT_DEMO=on -SUB_FILES+= cosmic_protector speed \ - pkg-message -MASTER_SITES+= SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:icons -DISTFILES+= cosmic_protector.png:icons \ - speed.png:icons -DESKTOP_ENTRIES+="Cosmic Protector" "Protect the earth from a deadly meteor shower" \ - "cosmic_protector" "cosmic_protector" "Game;ArcadeGame;" "" -DESKTOP_ENTRIES+="SPEED" "Simultaneous Projections Employing an Ensemble of Displays" \ - "speed" "speed" "Game;ArcadeGame;" "" -.else -CMAKE_ARGS+=-DWANT_DEMO=off -.endif - post-patch: @${REINPLACE_CMD} -e 's|lib$${LIB_SUFFIX}/pkgconfig|libdata/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt @@ -95,13 +82,12 @@ post-patch: post-install: ${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}${MAN3PREFIX}/man/man3/ - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} - @(cd ${DOCSRCDIR2} && ${COPYTREE_SHARE} "src html" ${STAGEDIR}${DOCSDIR2}) +post-install-DOCS-on: + @cd ${WRKSRC} && ${COPYTREE_SHARE} "README.txt docs/src docs/html" ${STAGEDIR}${DOCSDIR} -.if ${PORT_OPTIONS:MEXAMPLES} +post-install-EXAMPLES-on: @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) -. for l in ex_acodec ex_acodec_multi ex_audio_chain ex_audio_props ex_audio_simple \ +.for l in ex_acodec ex_acodec_multi ex_audio_chain ex_audio_props ex_audio_simple \ ex_bitmap ex_bitmap_flip ex_bitmap_target ex_blend ex_blend2 \ ex_blend_bench ex_blend_test ex_blit ex_clip ex_color ex_config ex_convert \ ex_dir ex_disable_screensaver ex_display_events ex_display_options \ @@ -118,10 +104,9 @@ post-install: ex_synth ex_threads ex_threads2 ex_timedwait ex_timer ex_transform ex_ttf \ ex_user_events ex_utf8 ex_vsync ex_warp_mouse ex_windows ex_winfull ${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/${l} -. endfor -.endif +.endfor -.if ${PORT_OPTIONS:MDEMOS} && ${PORT_OPTIONS:MEXAMPLES} +post-install-DEMOS-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} demos ${STAGEDIR}${EXAMPLESDIR}) ${INSTALL_SCRIPT} ${WRKDIR}/cosmic_protector ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${_DISTDIR}/cosmic_protector.png ${STAGEDIR}${PREFIX}/share/pixmaps/ @@ -131,6 +116,5 @@ post-install: @(cd ${STAGEDIR}${EXAMPLESDIR}/demos/speed && ${CHMOD} 755 speed) ${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/demos/cosmic_protector/cosmic_protector ${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/demos/speed/speed -.endif .include <bsd.port.mk> Modified: head/devel/allegro-devel/pkg-descr ============================================================================== --- head/devel/allegro-devel/pkg-descr Thu Aug 22 17:20:45 2019 (r509617) +++ head/devel/allegro-devel/pkg-descr Thu Aug 22 17:20:56 2019 (r509618) @@ -4,4 +4,4 @@ other types of multimedia programming. A wide range of extension packages and add-on modules are also available, which can be found in the "Library Extensions" section of the Allegro website. -WWW: http://www.talula.demon.co.uk/allegro/ +WWW: https://liballeg.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908221720.x7MHKuCa081706>