From owner-svn-ports-all@freebsd.org Tue Dec 22 04:55:16 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2B9C2A4D786; Tue, 22 Dec 2015 04:55:16 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0980615AC; Tue, 22 Dec 2015 04:55:15 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBM4tFJ5044877; Tue, 22 Dec 2015 04:55:15 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBM4tE1I044869; Tue, 22 Dec 2015 04:55:14 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201512220455.tBM4tE1I044869@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Tue, 22 Dec 2015 04:55:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404213 - in head/games/stepmania-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2015 04:55:16 -0000 Author: miwi Date: Tue Dec 22 04:55:14 2015 New Revision: 404213 URL: https://svnweb.freebsd.org/changeset/ports/404213 Log: - Update to 5.0.10 PR: 204443 Submitted by: Ports Fury Approved by: mat (mentor) Differential Revision: D4616 Added: head/games/stepmania-devel/files/patch-StepmaniaCore.cmake (contents, props changed) head/games/stepmania-devel/files/patch-extern__CMakeLists.txt (contents, props changed) head/games/stepmania-devel/files/patch-src__CMakeData-arch.cmake (contents, props changed) head/games/stepmania-devel/files/patch-src__CMakeLists.txt (contents, props changed) Modified: head/games/stepmania-devel/Makefile head/games/stepmania-devel/distinfo head/games/stepmania-devel/pkg-plist Modified: head/games/stepmania-devel/Makefile ============================================================================== --- head/games/stepmania-devel/Makefile Tue Dec 22 04:49:24 2015 (r404212) +++ head/games/stepmania-devel/Makefile Tue Dec 22 04:55:14 2015 (r404213) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= stepmania -PORTVERSION= 5.0.9 +PORTVERSION= 5.0.10 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= games @@ -19,49 +19,39 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/deve USE_GITHUB= yes -USES= autoreconf gmake iconv jpeg pathfix perl5 pkgconfig shebangfix +USES= cmake:outsource iconv jpeg pathfix perl5 pkgconfig shebangfix +SHEBANG_FILES= Utils/*.pl extern/zlib/zlib2ansi USE_XORG= x11 xrandr xtst USE_GL= glew USE_PERL5= build -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-system-pcre \ - ${ICONV_CONFIGURE_ARG} +CMAKE_ARGS= -DHAVE__MKDIR:BOOL=OFF INSTALLS_ICONS= yes -SHEBANG_FILES= Utils/*.pl \ - extern/zlib/zlib2ansi -CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= ALSA DOCS FFMPEG GTK2 JACK MAD PULSEAUDIO VORBIS +OPTIONS_DEFINE= ALSA DOCS FFMPEG GTK2 JACK MAD PULSEAUDIO VAAPI VORBIS OPTIONS_DEFAULT= GTK2 MAD VORBIS OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib -ALSA_CONFIGURE_ENV_OFF= ac_cv_lib_asound_snd_ctl_open=no +ALSA_CMAKE_OFF= -DWITH_ALSA:BOOL=OFF +FFMEPG_BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg -FFMPEG_CONFIGURE_ON= --with-system-ffmpeg -FFMPEG_CONFIGURE_WITH= ffmpeg +FFMPEG_CMAKE_ON= -DWITH_SYSTEM_FFMPEG:BOOL=ON +FFMPEG_CMAKE_OFF= -DWITH_FFMPEG:BOOL=OFF GTK2_USE= gnome=gtk20 -GTK2_CONFIGURE_ENABLE= gtk2 +GTK2_CMAKE_ON= -DWITH_GTK2:BOOL=ON JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack -JACK_CONFIGURE_WITH= jack +JACK_CONFIGURE_OFF= -DWITH_JACK:BOOL=OFF MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad -MAD_CONFIGURE_WITH= mp3 +MAD_CMAKE_OFF= -DWITH_MP3:BOOL=OFF PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio -PULSEAUDIO_CONFIGURE_ENV_OFF= ac_cv_lib_pulse_pa_stream_new=no +PULSEAUDIO_CMAKE_OFF= -DWITH_PULSE:BOOL=OFF +VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva +VAAPI_CMAKE_OFF= -DVA_FOUND:BOOL=OFF VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis -VORBIS_CONFIGURE_WITH= vorbis - -post-patch: - @${REINPLACE_CMD} -e \ - 's|^\(x86_64\)|amd64*\|\1| ; \ - s|-lpthread|-pthread|' ${WRKSRC}/configure.ac - @${REINPLACE_CMD} -e \ - 's|XLIBS+="-l|XLIBS="$$XLIBS -l|' ${WRKSRC}/autoconf/m4/x11.m4 - @${REINPLACE_CMD} -e \ - 's|-rdynamic|-Wl,-export-dynamic| ; \ - s|-finline-limit=300||' ${WRKSRC}/src/Makefile.am +VORBIS_CMAKE_OFF= -DWITH_OGG:BOOL=OFF pre-build: @${MKDIR} ${WRKDIR}/wrappers @@ -79,25 +69,24 @@ do-install: ${STAGEDIR}${PREFIX}/bin) @${MKDIR} ${STAGEDIR}${PREFIX}/lib/stepmania .for i in Announcers BGAnimations BackgroundEffects BackgroundTransitions \ - Characters Courses Data NoteSkins Scripts Themes + Characters Courses Data NoteSkins Scripts Songs Themes @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} \ ${STAGEDIR}${PREFIX}/lib/stepmania) .endfor - (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} stepmania \ + (cd ${WRKSRC} && ${INSTALL_PROGRAM} stepmania \ ${STAGEDIR}${PREFIX}/lib/stepmania) - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/stepmania/Songs (cd ${WRKSRC} && ${INSTALL_DATA} stepmania.desktop \ ${STAGEDIR}${PREFIX}/share/applications) @(cd ${WRKSRC} && ${COPYTREE_SHARE} icons \ ${STAGEDIR}${PREFIX}/share) +post-install-GTK2-on: + (cd ${WRKSRC} && ${INSTALL_LIB} GtkModule.so \ + ${STAGEDIR}${PREFIX}/lib/stepmania) + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC}/Docs && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DOCSDIR} "! -name Licenses.txt") -post-install-GTK2-on: - (cd ${WRKSRC}/src && ${INSTALL_LIB} GtkModule.so \ - ${STAGEDIR}${PREFIX}/lib/stepmania) - .include Modified: head/games/stepmania-devel/distinfo ============================================================================== --- head/games/stepmania-devel/distinfo Tue Dec 22 04:49:24 2015 (r404212) +++ head/games/stepmania-devel/distinfo Tue Dec 22 04:55:14 2015 (r404213) @@ -1,2 +1,2 @@ -SHA256 (stepmania-stepmania-v5.0.9_GH0.tar.gz) = 9f0566e36a578d499f6cbbb4e32b4d762182a991f6bc37df762c433976a80142 -SIZE (stepmania-stepmania-v5.0.9_GH0.tar.gz) = 197144798 +SHA256 (stepmania-stepmania-v5.0.10_GH0.tar.gz) = 8c6d375da82fede5752442c39254b76d3013102bb6f73f2fa8053f8e6fff0b70 +SIZE (stepmania-stepmania-v5.0.10_GH0.tar.gz) = 176559619 Added: head/games/stepmania-devel/files/patch-StepmaniaCore.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/stepmania-devel/files/patch-StepmaniaCore.cmake Tue Dec 22 04:55:14 2015 (r404213) @@ -0,0 +1,44 @@ +--- StepmaniaCore.cmake.orig 2015-10-30 15:55:52.000000000 +0900 ++++ StepmaniaCore.cmake 2015-11-09 01:49:26.062972000 +0900 +@@ -308,7 +308,7 @@ + MAC_FRAME_OPENGL + MAC_FRAME_QUICKTIME + ) +-elseif(LINUX) ++else() + if(WITH_GTK2) + find_package("GTK2" 2.0) + if (${GTK2_FOUND}) +@@ -350,26 +350,32 @@ + set(HAX_XRANDR FALSE) + endif() + ++ if(WITH_PULSE) + find_package(PulseAudio) + if (PULSEAUDIO_FOUND) + set(HAS_PULSE TRUE) + else() + set(HAS_PULSE FALSE) + endif() ++ endif() + ++ if(WITH_ALSA) + find_package(ALSA) + if (ALSA_FOUND) + set(HAS_ALSA TRUE) + else() + set(HAS_ALSA FALSE) + endif() ++ endif() + ++ if(WITH_JACK) + find_package(JACK) + if (JACK_FOUND) + set(HAS_JACK TRUE) + else() + set(HAS_JACK FALSE) + endif() ++ endif() + + find_package(OSS) + if (OSS_FOUND) Added: head/games/stepmania-devel/files/patch-extern__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/stepmania-devel/files/patch-extern__CMakeLists.txt Tue Dec 22 04:55:14 2015 (r404213) @@ -0,0 +1,14 @@ +--- extern/CMakeLists.txt.orig 2015-10-30 06:55:52 UTC ++++ extern/CMakeLists.txt +@@ -1,5 +1,4 @@ + include(CMakeProject-lua.cmake) +-include(CMakeProject-glew.cmake) + include(CMakeProject-json.cmake) + if (APPLE OR MSVC) + include(CMakeProject-mad.cmake) +@@ -16,5 +15,4 @@ if (NOT SYSTEM_PCRE_FOUND) + endif() + include(CMakeProject-tomcrypt.cmake) + include(CMakeProject-tommath.cmake) +-include(CMakeProject-png.cmake) + Added: head/games/stepmania-devel/files/patch-src__CMakeData-arch.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/stepmania-devel/files/patch-src__CMakeData-arch.cmake Tue Dec 22 04:55:14 2015 (r404213) @@ -0,0 +1,11 @@ +--- src/CMakeData-arch.cmake.orig 2015-10-30 06:55:52 UTC ++++ src/CMakeData-arch.cmake +@@ -243,7 +243,7 @@ else() + list(APPEND SMDATA_ARCH_LOADING_HPP + "arch/LoadingWindow/LoadingWindow_MacOSX.h" + ) +- elseif(LINUX) ++ else() + if (GTK2_FOUND) + list(APPEND SMDATA_ARCH_LOADING_SRC + "arch/LoadingWindow/LoadingWindow_Gtk.cpp" Added: head/games/stepmania-devel/files/patch-src__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/stepmania-devel/files/patch-src__CMakeLists.txt Tue Dec 22 04:55:14 2015 (r404213) @@ -0,0 +1,19 @@ +--- src/CMakeLists.txt.orig 2015-10-30 06:55:52 UTC ++++ src/CMakeLists.txt +@@ -328,7 +328,7 @@ list(APPEND SMDATA_LINK_LIB + "zlib" + "jsoncpp" + "png" +- "glew" ++ "GLEW" + "jpeg" + ) + +@@ -521,7 +521,6 @@ list(APPEND SM_INCLUDE_DIRS + ) + if(NOT APPLE) + list(APPEND SM_INCLUDE_DIRS +- "${SM_EXTERN_DIR}/glew-1.5.8/include" + "${SM_EXTERN_DIR}/jsoncpp/include" + "${SM_EXTERN_DIR}/zlib" + ) Modified: head/games/stepmania-devel/pkg-plist ============================================================================== --- head/games/stepmania-devel/pkg-plist Tue Dec 22 04:49:24 2015 (r404212) +++ head/games/stepmania-devel/pkg-plist Tue Dec 22 04:55:14 2015 (r404213) @@ -1594,6 +1594,21 @@ lib/stepmania/NoteSkins/techno/default/m lib/stepmania/Scripts/32log.lua lib/stepmania/Scripts/extend_table.lua lib/stepmania/Scripts/unavailable_functions.lua +lib/stepmania/Songs/StepMania 5/Goin' Under/Goin' Under.ogg +lib/stepmania/Songs/StepMania 5/Goin' Under/Goin' Under.sm +lib/stepmania/Songs/StepMania 5/Goin' Under/Goin' Under.ssc +lib/stepmania/Songs/StepMania 5/Goin' Under/bg.png +lib/stepmania/Songs/StepMania 5/Goin' Under/bn.png +lib/stepmania/Songs/StepMania 5/MechaTribe Assault/Mecha-Tribe Assault.ogg +lib/stepmania/Songs/StepMania 5/MechaTribe Assault/Mecha-Tribe Assault.ssc +lib/stepmania/Songs/StepMania 5/MechaTribe Assault/mechatribeassaultbg.png +lib/stepmania/Songs/StepMania 5/MechaTribe Assault/mechatribeassaultbn.png +lib/stepmania/Songs/StepMania 5/MechaTribe Assault/wyde cd-tital.png +lib/stepmania/Songs/StepMania 5/Springtime/Kommisar - Springtime.mp3 +lib/stepmania/Songs/StepMania 5/Springtime/Springtime.ssc +lib/stepmania/Songs/StepMania 5/Springtime/spring.png +lib/stepmania/Songs/StepMania 5/Springtime/springbn.png +lib/stepmania/Songs/instructions.txt lib/stepmania/Themes/_Installer/Languages/de.ini lib/stepmania/Themes/_Installer/Languages/en.ini lib/stepmania/Themes/_Installer/Languages/es.ini @@ -1781,10 +1796,10 @@ lib/stepmania/Themes/_fallback/Fonts/_ja lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [kanji 9] 8x8 (doubleres).png lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [kanji-jis1-stroke] 32x32 (doubleres).png lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [kanji-jis1] 32x32 (doubleres).png -lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [kanji-jis2-stroke] 32x106 (doubleres).png -lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [kanji-jis2] 32x106 (doubleres).png -lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [kanji-regular-stroke] 32x61 (doubleres).png -lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [kanji-regular] 32x61 (doubleres).png +lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [kanji-jis2-stroke] 63x54 (doubleres).png +lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [kanji-jis2] 63x54 (doubleres).png +lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [kanji-regular-stroke] 48x41 (doubleres).png +lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [kanji-regular] 48x41 (doubleres).png lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [main-stroke] 16x16 (doubleres).png lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [main] 16x16 (doubleres).png lib/stepmania/Themes/_fallback/Fonts/_japanese 24px [symbol-stroke] 26x3 (doubleres).png @@ -2850,6 +2865,7 @@ share/applications/stepmania.desktop %%PORTDOCS%%%%DOCSDIR%%/Themerdocs/moremsg.txt %%PORTDOCS%%%%DOCSDIR%%/Themerdocs/recommended_practices.txt %%PORTDOCS%%%%DOCSDIR%%/Themerdocs/sm-ssc_themeguide.txt +%%PORTDOCS%%%%DOCSDIR%%/Userdocs/Keymaps_ini_format.md %%PORTDOCS%%%%DOCSDIR%%/Userdocs/bgchanges_format.txt %%PORTDOCS%%%%DOCSDIR%%/Userdocs/sm5_beginner.txt %%PORTDOCS%%%%DOCSDIR%%/credits.txt @@ -2883,4 +2899,3 @@ share/icons/hicolor/64x64/apps/stepmania share/icons/hicolor/72x72/apps/stepmania-ssc.png share/icons/hicolor/96x96/apps/stepmania-ssc.png share/icons/hicolor/scalable/apps/stepmania-ssc.svg -@dir lib/stepmania/Songs