Date: Tue, 25 Feb 2020 17:49:38 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527098 - in head: . graphics graphics/eos-movrec graphics/eos-movrec/files Message-ID: <202002251749.01PHnc1m042350@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Feb 25 17:49:37 2020 New Revision: 527098 URL: https://svnweb.freebsd.org/changeset/ports/527098 Log: - Backport upstream r141 (switch to Qt5) and resurrect - Narrow down `dos2unix' fixup to one needed file only - Fix symlink which was pointing to an absolute path - Drop INSTALLS_ICONS knob (not applicable to Qt ports) Added: head/graphics/eos-movrec/ - copied from r495966, head/graphics/eos-movrec/ head/graphics/eos-movrec/files/patch-CMakeLists.txt (contents, props changed) Modified: head/MOVED head/graphics/Makefile head/graphics/eos-movrec/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Tue Feb 25 17:32:03 2020 (r527097) +++ head/MOVED Tue Feb 25 17:49:37 2020 (r527098) @@ -11803,7 +11803,6 @@ graphics/burplex||2019-03-16|Has expired: Qt4 has been graphics/darknock||2019-03-16|Has expired: Qt4 has been EOL since december 2015 graphics/djview4-qt4||2019-03-16|Has expired: Qt4 has been EOL since december 2015 graphics/easypaint||2019-03-16|Has expired: Qt4 has been EOL since december 2015 -graphics/eos-movrec||2019-03-16|Has expired: Qt4 has been EOL since december 2015 graphics/gle-graphics||2019-03-16|Has expired: Qt4 has been EOL since december 2015 graphics/lprof-devel||2019-03-16|Has expired: Qt4 has been EOL since december 2015 graphics/luminance||2019-03-16|Has expired: Qt4 has been EOL since december 2015 Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Tue Feb 25 17:32:03 2020 (r527097) +++ head/graphics/Makefile Tue Feb 25 17:49:37 2020 (r527098) @@ -155,6 +155,7 @@ SUBDIR += eog SUBDIR += eog-plugins SUBDIR += eom + SUBDIR += eos-movrec SUBDIR += epdfview SUBDIR += ephoto SUBDIR += epix Modified: head/graphics/eos-movrec/Makefile ============================================================================== --- head/graphics/eos-movrec/Makefile Sat Mar 16 21:52:35 2019 (r495966) +++ head/graphics/eos-movrec/Makefile Tue Feb 25 17:49:37 2020 (r527098) @@ -12,16 +12,12 @@ COMMENT= Capture short movies with Canon DSLR camera LICENSE= GPLv2 -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 -USES= cmake dos2unix pkgconfig qt:4 tar:bzip2 -DOS2UNIX_GLOB= *.pro *.cpp *.h -USE_QT= qmake_build moc_build rcc_build uic_build gui +USES= cmake dos2unix pkgconfig qt:5 tar:bzip2 +DOS2UNIX_FILES= main.cpp +USE_QT= buildtools_build qmake_build core gui widgets -INSTALLS_ICONS= yes ICON_SIZES= 16x16 32x32 128x128 256x256 512x512 DESKTOP_ENTRIES="EOS Camera Movie Recorder" "" "${PORTNAME}" \ @@ -40,7 +36,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/mac.icons/${PORTNAME}_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png .endfor - ${LN} -sf ${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png \ + ${LN} -sf ../icons/hicolor/32x32/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ .include <bsd.port.mk> Added: head/graphics/eos-movrec/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/eos-movrec/files/patch-CMakeLists.txt Tue Feb 25 17:49:37 2020 (r527098) @@ -0,0 +1,77 @@ +--- CMakeLists.txt.orig 2015-01-27 14:22:56 UTC ++++ CMakeLists.txt +@@ -24,12 +24,14 @@ if(WIN32) + endif(MINGW) + endif(WIN32) + +-find_package(Qt4 4.4.2 COMPONENTS QtCore QtGui REQUIRED) +-include(${QT_USE_FILE}) + +-add_definitions (${QT_DEFINITIONS}) +-include_directories (${QT_INCLUDES} ${CMAKE_BINARY_DIR}) ++# Find the Qt5 libraries ++find_package(Qt5Core REQUIRED) ++find_package(Qt5Gui REQUIRED) ++find_package(Qt5Widgets REQUIRED) + ++include_directories(${CMAKE_BINARY_DIR}) ++ + set(EDSDK_LDFLAGS "") + if(WIN32) + set(EDSDKPATH "${CMAKE_SOURCE_DIR}/EDSDK") +@@ -50,6 +52,13 @@ elseif(UNIX) + add_definitions(-DGPHOTO2=1) + endif(WIN32) + ++# Find includes in corresponding current build & source directories ++set(CMAKE_INCLUDE_CURRENT_DIR ON) ++ ++# Instruct CMake to run moc automatically when needed. ++set(CMAKE_AUTOMOC ON) ++set(CMAKE_AUTOUIC ON) ++ + set(eos_movrec_SRCS + main.cpp + mainwnd.cpp +@@ -73,12 +82,6 @@ if(WIN32) + set_property(SOURCE eos_movrec.rc PROPERTY OBJECT_DEPENDS ${CMAKE_SOURCE_DIR}/CMakeLists.txt) + endif(WIN32) + +-# headers with Q_OBJECT +-set(eos_movrec_MOC_HEADERS +- mainwnd.h +- blinklabel.h +-) +- + # force use exceptions + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") + # add debug defines +@@ -86,12 +89,13 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG") + + add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1) +-QT4_WRAP_CPP(MOC_SRCS ${eos_movrec_MOC_HEADERS}) + + if (WIN32) + set(CMAKE_RC_COMPILER windres) + # set rc syntax + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -O coff -o <OBJECT> <SOURCE>") ++ set(CMAKE_RC_SOURCE_FILE_EXTENSIONS rc) ++ set(CMAKE_RC_FLAGS "-I${CMAKE_BINARY_DIR}") + + # enable resource language + enable_language(RC) +@@ -102,10 +106,10 @@ if (WIN32) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import") + endif(WIN32) + +-add_executable(eos_movrec ${eos_movrec_SRCS} ${MOC_SRCS}) ++add_executable(eos_movrec WIN32 ${eos_movrec_SRCS}) + if (WIN32) +- TARGET_LINK_LIBRARIES(eos_movrec ${QT_LIBRARIES} ${EDSDK_LDFLAGS}) ++ TARGET_LINK_LIBRARIES(eos_movrec Qt5::Core Qt5::Gui Qt5::Widgets ${EDSDK_LDFLAGS}) + elseif(UNIX) +- TARGET_LINK_LIBRARIES(eos_movrec ${QT_LIBRARIES} ${LIBGPHOTO2_LDFLAGS}) ++ TARGET_LINK_LIBRARIES(eos_movrec Qt5::Core Qt5::Gui Qt5::Widgets ${LIBGPHOTO2_LDFLAGS}) + endif(WIN32) + install(TARGETS eos_movrec RUNTIME DESTINATION bin)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002251749.01PHnc1m042350>