Received: by mail.netbsd.org (Postfix, from userid 605) id 4BB8B84D3F; Wed, 2 Jan 2019 00:30:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C88E684CD6 for ; Wed, 2 Jan 2019 00:30:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 6XX_DlR5p62c for ; Wed, 2 Jan 2019 00:30:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id EBA8C84CCF for ; Wed, 2 Jan 2019 00:30:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E1AFBFB16; Wed, 2 Jan 2019 00:30:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154638900120370" MIME-Version: 1.0 Date: Wed, 2 Jan 2019 00:30:01 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/emulators/dolphin-emu To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20190102003001.E1AFBFB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_154638900120370 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Wed Jan 2 00:30:01 UTC 2019 Modified Files: pkgsrc/emulators/dolphin-emu: Makefile PLIST distinfo pkgsrc/emulators/dolphin-emu/patches: patch-CMakeLists.txt Log Message: emulators/dolphin-emu: Install icons, .desktop file, and man pages. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/dolphin-emu/Makefile \ pkgsrc/emulators/dolphin-emu/PLIST pkgsrc/emulators/dolphin-emu/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/emulators/dolphin-emu/patches/patch-CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154638900120370 Content-Disposition: inline Content-Length: 9564 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/dolphin-emu/Makefile diff -u pkgsrc/emulators/dolphin-emu/Makefile:1.1 pkgsrc/emulators/dolphin-emu/Makefile:1.2 --- pkgsrc/emulators/dolphin-emu/Makefile:1.1 Tue Jan 1 17:19:58 2019 +++ pkgsrc/emulators/dolphin-emu/Makefile Wed Jan 2 00:30:01 2019 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2019/01/01 17:19:58 nia Exp $ +# $NetBSD: Makefile,v 1.2 2019/01/02 00:30:01 nia Exp $ DISTNAME= dolphin-emu-5.0 +PKGREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=dolphin-emu/} GITHUB_PROJECT= dolphin @@ -20,6 +21,8 @@ USE_LANGUAGES= c c++ # is always used. CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SFML=ON +CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR} + .include "../../mk/bsd.prefs.mk" ONLY_FOR_PLATFORM= ${LITTLEENDIANPLATFORMS} @@ -35,18 +38,19 @@ NOT_PAX_MPROTECT_SAFE+= bin/dolphin-emu NOT_PAX_MPROTECT_SAFE+= bin/dolphin-emu-nogui .include "options.mk" -.include "../../archivers/lzo/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libusb1/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../multimedia/ffmpeg4/buildlink3.mk" .include "../../net/miniupnpc/buildlink3.mk" .include "../../security/mbedtls/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .if ${OPSYS} != "Darwin" +.include "../../archivers/lzo/buildlink3.mk" .include "../../devel/SDL2/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .endif Index: pkgsrc/emulators/dolphin-emu/PLIST diff -u pkgsrc/emulators/dolphin-emu/PLIST:1.1 pkgsrc/emulators/dolphin-emu/PLIST:1.2 --- pkgsrc/emulators/dolphin-emu/PLIST:1.1 Tue Jan 1 17:19:58 2019 +++ pkgsrc/emulators/dolphin-emu/PLIST Wed Jan 2 00:30:01 2019 @@ -1,6 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2019/01/01 17:19:58 nia Exp $ +@comment $NetBSD: PLIST,v 1.2 2019/01/02 00:30:01 nia Exp $ bin/dolphin-emu bin/dolphin-emu-nogui +man/man6/dolphin-emu-nogui.6 +man/man6/dolphin-emu.6 +share/applications/dolphin-emu.desktop share/dolphin-emu/license.txt share/dolphin-emu/sys/GC/dsp_coef.bin share/dolphin-emu/sys/GC/dsp_rom.bin @@ -1569,6 +1572,8 @@ share/dolphin-emu/sys/Wii/shared2/wc24/n share/dolphin-emu/sys/Wii/shared2/wc24/nwc24msg.cfg share/dolphin-emu/sys/codehandler.bin share/dolphin-emu/sys/totaldb.dsy +share/icons/hicolor/48x48/apps/dolphin-emu.png +share/icons/hicolor/scalable/apps/dolphin-emu.svg share/locale/ar/LC_MESSAGES/dolphin-emu.mo share/locale/ca/LC_MESSAGES/dolphin-emu.mo share/locale/cs/LC_MESSAGES/dolphin-emu.mo Index: pkgsrc/emulators/dolphin-emu/distinfo diff -u pkgsrc/emulators/dolphin-emu/distinfo:1.1 pkgsrc/emulators/dolphin-emu/distinfo:1.2 --- pkgsrc/emulators/dolphin-emu/distinfo:1.1 Tue Jan 1 17:19:58 2019 +++ pkgsrc/emulators/dolphin-emu/distinfo Wed Jan 2 00:30:01 2019 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.1 2019/01/01 17:19:58 nia Exp $ +$NetBSD: distinfo,v 1.2 2019/01/02 00:30:01 nia Exp $ SHA1 (dolphin-emu-5.0.tar.gz) = 6553f9fe5281326b86f33fb6b99a93fe6a8820af RMD160 (dolphin-emu-5.0.tar.gz) = e8c4cb2c903b78c3e21cb12b0724ab0728c1391a SHA512 (dolphin-emu-5.0.tar.gz) = 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a Size (dolphin-emu-5.0.tar.gz) = 38246344 bytes -SHA1 (patch-CMakeLists.txt) = cb1d89570374898bf8cf260a2df8ac2aba3f15fa +SHA1 (patch-CMakeLists.txt) = 6e0163c4d385f31981a13e4f8527c873820ba6a6 SHA1 (patch-Externals_SFML_include_SFML_Config.hpp) = 75ece2ce86b54b219a80d6ff028ecc80a00454f5 SHA1 (patch-Source_Core_Common_FileUtil.cpp) = 27b859714e294abbfb3f468928e22b30abfd0099 SHA1 (patch-Source_Core_Common_MemoryUtil.cpp) = af681a3f43687f7af09c87732a7a2da8e8c58e05 Index: pkgsrc/emulators/dolphin-emu/patches/patch-CMakeLists.txt diff -u pkgsrc/emulators/dolphin-emu/patches/patch-CMakeLists.txt:1.1 pkgsrc/emulators/dolphin-emu/patches/patch-CMakeLists.txt:1.2 --- pkgsrc/emulators/dolphin-emu/patches/patch-CMakeLists.txt:1.1 Tue Jan 1 17:19:58 2019 +++ pkgsrc/emulators/dolphin-emu/patches/patch-CMakeLists.txt Wed Jan 2 00:30:01 2019 @@ -1,7 +1,9 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2019/01/01 17:19:58 nia Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2019/01/02 00:30:01 nia Exp $ Allow better control over what libraries are detected. +Install data unconditionally. + --- CMakeLists.txt.orig 2016-06-24 08:09:07.000000000 +0000 +++ CMakeLists.txt @@ -15,6 +15,12 @@ option(ENABLE_PCH "Use PCH to speed up c @@ -26,7 +28,24 @@ Allow better control over what libraries # Enable SDL for default on operating systems that aren't OSX, Android, Linux or Windows. if(NOT APPLE AND NOT ANDROID AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT MSVC) -@@ -444,6 +450,7 @@ if (OPENGL_GL) +@@ -82,16 +88,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT + set(LIBS) + + # Set up paths +-if(APPLE) +- # The gettext module will install the translations unconditionally. +- # Redirect the installation to a build directory where it does no harm. +- set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install-dummy) +-else() + set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir") + set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir") + set(mandir ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "mandir") + add_definitions(-DDATA_DIR="${datadir}/") +-endif() + + # Set where the binary files will be built. The program will not execute from + # here. You must run "make install" to install these to the proper location +@@ -444,6 +444,7 @@ if (OPENGL_GL) include_directories(${OPENGL_INCLUDE_DIR}) endif() @@ -34,7 +53,7 @@ Allow better control over what libraries include(FindALSA OPTIONAL) if(ALSA_FOUND) add_definitions(-DHAVE_ALSA=1) -@@ -452,7 +459,9 @@ else() +@@ -452,7 +453,9 @@ else() add_definitions(-DHAVE_ALSA=0) message("ALSA NOT found, disabling ALSA sound backend") endif(ALSA_FOUND) @@ -44,7 +63,7 @@ Allow better control over what libraries check_lib(AO ao ao QUIET) if(AO_FOUND) add_definitions(-DHAVE_AO=1) -@@ -461,6 +470,7 @@ else() +@@ -461,6 +464,7 @@ else() add_definitions(-DHAVE_AO=0) message("ao NOT found, disabling ao sound backend") endif(AO_FOUND) @@ -52,7 +71,7 @@ Allow better control over what libraries check_lib(BLUEZ bluez bluez QUIET) if(BLUEZ_FOUND) -@@ -471,6 +481,7 @@ else() +@@ -471,6 +475,7 @@ else() message("bluez NOT found, disabling bluetooth support") endif(BLUEZ_FOUND) @@ -60,7 +79,7 @@ Allow better control over what libraries check_lib(PULSEAUDIO libpulse pulse QUIET) if(PULSEAUDIO_FOUND) add_definitions(-DHAVE_PULSEAUDIO=1) -@@ -479,7 +490,9 @@ else() +@@ -479,7 +484,9 @@ else() add_definitions(-DHAVE_PULSEAUDIO=0) message("PulseAudio NOT found, disabling PulseAudio sound backend") endif(PULSEAUDIO_FOUND) @@ -70,7 +89,7 @@ Allow better control over what libraries include(FindOpenAL OPTIONAL) if(OPENAL_FOUND) add_definitions(-DHAVE_OPENAL=1) -@@ -489,7 +502,9 @@ else() +@@ -489,7 +496,9 @@ else() add_definitions(-DHAVE_OPENAL=0) message("OpenAL NOT found, disabling OpenAL sound backend") endif(OPENAL_FOUND) @@ -80,7 +99,7 @@ Allow better control over what libraries include(FindLLVM OPTIONAL) if (LLVM_FOUND) add_definitions(-DHAS_LLVM=1) -@@ -500,6 +515,7 @@ if (LLVM_FOUND) +@@ -500,6 +509,7 @@ if (LLVM_FOUND) message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") endif() @@ -88,7 +107,7 @@ Allow better control over what libraries set(USE_X11 0) -@@ -547,6 +563,7 @@ if(ENCODE_FRAMEDUMPS) +@@ -547,6 +557,7 @@ if(ENCODE_FRAMEDUMPS) endif() @@ -96,7 +115,7 @@ Allow better control over what libraries set(CMAKE_REQUIRED_LIBRARIES portaudio) CHECK_CXX_SOURCE_RUNS( "#include -@@ -563,6 +580,7 @@ else() +@@ -563,6 +574,7 @@ else() add_definitions(-DHAVE_PORTAUDIO=0) set(PORTAUDIO_FOUND FALSE) endif(PORTAUDIO) @@ -104,7 +123,7 @@ Allow better control over what libraries if(OPROFILING) include(FindOProfile) -@@ -854,27 +872,8 @@ if(NOT DISABLE_WX) +@@ -854,27 +866,8 @@ if(NOT DISABLE_WX) endif(wxWidgets_FOUND) if(UNIX AND NOT APPLE) @@ -134,3 +153,30 @@ Allow better control over what libraries endif() if(wxWidgets_FOUND) +@@ -986,13 +979,8 @@ add_subdirectory(Source) + ######################################## + # Install shared data files + # +-if(NOT APPLE) + install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN) +-endif() +-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin") + install(FILES Data/license.txt DESTINATION ${datadir}) +-endif() +-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + # Install the application icon and menu item + install(FILES Data/dolphin-emu.svg + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps) +@@ -1002,10 +990,9 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) + # Install manpages + install(FILES Data/dolphin-emu.6 +- DESTINATION ${mandir}/man6) ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/${PKGMANDIR}/man6) + install(FILES Data/dolphin-emu-nogui.6 +- DESTINATION ${mandir}/man6) +-endif() ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/${PKGMANDIR}/man6) + + # packaging information + set(CPACK_PACKAGE_NAME "dolphin-emu") --_----------=_154638900120370--