Date: Tue, 17 Jul 2018 18:18:56 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474821 - in head: . graphics graphics/libprojectm graphics/libprojectm/files graphics/projectm-libvisual Message-ID: <201807171818.w6HIIuhU096827@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Tue Jul 17 18:18:56 2018 New Revision: 474821 URL: https://svnweb.freebsd.org/changeset/ports/474821 Log: graphics/libprojectm: Update 2.0.1 -> 2.1.0 Port changes: * Change to DISTVERSION * Add LICENSE_FILE * Add to LIB_DEPENDS * Now depends on Qt4 * Add options PULSEAUDIO JACK * Improve the .sample generting code Remove graphics/projectm-libvisual: it is merged into libprojectm PR: 229825 Approved by: crees (removal of graphics/projectm-libvisual) Added: head/graphics/libprojectm/files/patch-src_libprojectM_CMakeLists.txt (contents, props changed) head/graphics/libprojectm/files/patch-src_libprojectM_NativePresetFactory_CMakeLists.txt (contents, props changed) Deleted: head/graphics/libprojectm/files/patch-Renderer_TextureManager.cpp head/graphics/libprojectm/files/patch-c++11 head/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake head/graphics/projectm-libvisual/ Modified: head/MOVED head/graphics/Makefile head/graphics/libprojectm/Makefile head/graphics/libprojectm/distinfo head/graphics/libprojectm/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Tue Jul 17 17:52:25 2018 (r474820) +++ head/MOVED Tue Jul 17 18:18:56 2018 (r474821) @@ -10351,3 +10351,4 @@ astro/p5-ZConf-Weather||2018-07-16|Has expired: Unmain sysutils/p5-ZConf-Cron||2018-07-16|Has expired: Unmaintained misc/artikulate-kde4||2018-07-17|Has expired: broken for more than three years vietnamese/kde4-l10||2018-07-17|Has expired: broken for more than three years +graphics/projectm-libvisual|graphics/libprojectm|2018-07-17|Code of projectm-libvisual was merged into graphics/libprojectm Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Tue Jul 17 17:52:25 2018 (r474820) +++ head/graphics/Makefile Tue Jul 17 18:18:56 2018 (r474821) @@ -871,7 +871,6 @@ SUBDIR += prison SUBDIR += processing SUBDIR += proj - SUBDIR += projectm-libvisual SUBDIR += pstoedit SUBDIR += pstoepsi SUBDIR += ptex Modified: head/graphics/libprojectm/Makefile ============================================================================== --- head/graphics/libprojectm/Makefile Tue Jul 17 17:52:25 2018 (r474820) +++ head/graphics/libprojectm/Makefile Tue Jul 17 18:18:56 2018 (r474821) @@ -1,36 +1,42 @@ # $FreeBSD$ PORTNAME= libprojectM -PORTVERSION= 2.0.1 -PORTREVISION= 5 +DISTVERSION= 2.1.0 CATEGORIES= graphics audio MASTER_SITES= SF/${PORTNAME:tl:S/lib//}/${PORTVERSION}/ -DISTNAME= ${PORTNAME:S/lib//}-${DISTVERSION}-Source +DISTNAME= ${PORTNAME:S/lib//}-complete-${DISTVERSION}-Source MAINTAINER= yuri@FreeBSD.org COMMENT= Awesome music visualiser LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.txt LIB_DEPENDS= libftgl.so:graphics/ftgl \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libvisual-0.4.so:graphics/libvisual04 -USES= cmake localbase:ldflags -CMAKE_ARGS= -DUSE_OPENMP=OFF # openmp breaks build on 11.x -USE_GL= glew +USES= cmake:outsource localbase:ldflags pkgconfig qt:4 +USE_QT= corelib gui opengl xml moc_build qmake_build rcc_build uic_build +USE_SDL= sdl +USE_GL= gl glu glew USE_LDCONFIG= yes -post-patch: -# Install config.inp.sample instead of overwriting user's file. -# Needs to be specific enough not to rename config.inp.in too! -# Also correct pkgconfig destination dir -- fiddly - @${REINPLACE_CMD} -e 's/config.inp\([\" ]\)/config.inp.sample\1/' \ - -e 's#\(/lib\)[^}]*}\(/pkgconfig\)#\1data\2#' \ - ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's#/usr/X11R6#${LOCALBASE}#' \ - ${WRKSRC}/cmake/FindFreetype2.cmake -# Fix empty libdir in pkgconfig file to stop vlc complaining - @${REINPLACE_CMD} -e 's#^\(libdir=\).*#\1${PREFIX}/lib#' \ - ${WRKSRC}/${PORTNAME}.pc.in +CMAKE_ARGS= -DUSE_OPENMP=OFF # openmp breaks build on 11.x +CMAKE_OFF= INCLUDE-PROJECTM-TEST + +OPTIONS_DEFINE= PULSEAUDIO JACK +OPTIONS_DEFAULT= PULSEAUDIO +OPTIONS_SUB= yes + +PULSEAUDIO_CMAKE_BOOL= INCLUDE-PROJECTM-PULSEAUDIO +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio + +JACK_CMAKE_BOOL= INCLUDE-PROJECTM-JACK +JACK_LIB_DEPENDS= libjack.so:audio/jack + +post-install: + @${MV} ${STAGEDIR}${PREFIX}/share/projectM/config.inp ${STAGEDIR}${PREFIX}/share/projectM/config.inp.sample + ${INSTALL_DATA} ${WRKSRC}/fonts/Vera.ttf ${STAGEDIR}${PREFIX}/share/projectM/fonts/ .include <bsd.port.mk> Modified: head/graphics/libprojectm/distinfo ============================================================================== --- head/graphics/libprojectm/distinfo Tue Jul 17 17:52:25 2018 (r474820) +++ head/graphics/libprojectm/distinfo Tue Jul 17 18:18:56 2018 (r474821) @@ -1,2 +1,3 @@ -SHA256 (projectM-2.0.1-Source.tar.gz) = c305182dfc8b7f87b82a146af6cf50a982e7c9c647877a0559dfef4b11dacb93 -SIZE (projectM-2.0.1-Source.tar.gz) = 865784 +TIMESTAMP = 1531809872 +SHA256 (projectM-complete-2.1.0-Source.tar.gz) = 513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee +SIZE (projectM-complete-2.1.0-Source.tar.gz) = 31130351 Added: head/graphics/libprojectm/files/patch-src_libprojectM_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libprojectm/files/patch-src_libprojectM_CMakeLists.txt Tue Jul 17 18:18:56 2018 (r474821) @@ -0,0 +1,20 @@ +--- src/libprojectM/CMakeLists.txt.orig 2018-07-17 06:57:00 UTC ++++ src/libprojectM/CMakeLists.txt +@@ -199,7 +199,7 @@ if(BUILD_PROJECTM_STATIC) + ${GLEW_LIBRARY} + ${FTGL_LINK_TARGETS} + ${MATH_LIBRARIES} +- dl ++ ${CMAKE_DL_LIBS} + ${OPENGL_LIBRARIES} + ) + else(BUILD_PROJECTM_STATIC) +@@ -210,7 +210,7 @@ else(BUILD_PROJECTM_STATIC) + ${GLEW_LIBRARY} + ${FTGL_LINK_TARGETS} + ${MATH_LIBRARIES} +- dl ++ ${CMAKE_DL_LIBS} + ${OPENGL_LIBRARIES} + ) + endif(BUILD_PROJECTM_STATIC) Added: head/graphics/libprojectm/files/patch-src_libprojectM_NativePresetFactory_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libprojectm/files/patch-src_libprojectM_NativePresetFactory_CMakeLists.txt Tue Jul 17 18:18:56 2018 (r474821) @@ -0,0 +1,17 @@ +--- src/libprojectM/NativePresetFactory/CMakeLists.txt.orig 2018-07-17 06:48:40 UTC ++++ src/libprojectM/NativePresetFactory/CMakeLists.txt +@@ -5,7 +5,7 @@ SET(NativePresetFactory_SOURCES NativePr + IF(NOT MSVC) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") + ENDIF(NOT MSVC) +-find_library(DL_LIBRARIES dl) ++#find_library(DL_LIBRARIES dl) + + if(MSVC) + SET (MATH_LIBRARIES ) +@@ -15,4 +15,4 @@ endif(MSVC) + + INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${Renderer_SOURCE_DIR}) + ADD_LIBRARY(NativePresetFactory STATIC ${NativePresetFactory_SOURCES}) +-TARGET_LINK_LIBRARIES(NativePresetFactory Renderer ${MATH_LIBRARIES} ${DL_LIBRARIES}) ++TARGET_LINK_LIBRARIES(NativePresetFactory Renderer ${MATH_LIBRARIES} ${CMAKE_DL_LIBS}) Modified: head/graphics/libprojectm/pkg-plist ============================================================================== --- head/graphics/libprojectm/pkg-plist Tue Jul 17 17:52:25 2018 (r474820) +++ head/graphics/libprojectm/pkg-plist Tue Jul 17 18:18:56 2018 (r474821) @@ -1,13 +1,24 @@ +%%JACK%%bin/projectM-jack +%%PULSEAUDIO%%bin/projectM-pulseaudio +include/libprojectM-qt/qprojectm_mainwindow.hpp include/libprojectM/Common.hpp include/libprojectM/PCM.hpp include/libprojectM/dlldefs.h include/libprojectM/event.h include/libprojectM/fatal.h include/libprojectM/projectM.hpp +lib/libprojectM-qt.so +lib/libprojectM-qt.so.1 +lib/libprojectM-qt.so.1.10 lib/libprojectM.so lib/libprojectM.so.2 -lib/libprojectM.so.2.00 +lib/libprojectM.so.2.1.0 +lib/libvisual-0.4/actor/libprojectM_libvisual.so +libdata/pkgconfig/libprojectM-qt.pc libdata/pkgconfig/libprojectM.pc +%%JACK%%share/applications/projectM-jack.desktop +%%PULSEAUDIO%%share/applications/projectM-pulseaudio.desktop +share/pixmaps/prjm16-transparent.svg @sample share/projectM/config.inp.sample share/projectM/fonts/Vera.ttf share/projectM/fonts/VeraMono.ttf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807171818.w6HIIuhU096827>