audio/hydrogen: Update to 1.0.0

PR:             248682
Submitted by:   Shane <FreeBSD@ShaneWare.Biz>  (maintainer)

6 files changed, 20 insertions, 33 deletions

diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index df212b132955..449ce77f4bde 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -2,9 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hydrogen
-DISTVERSION=	1.0.0-beta1-325
-DISTVERSIONSUFFIX=	-g538eaeb9
-PORTREVISION=	2
+DISTVERSION=	1.0.0
 CATEGORIES=	audio
 
 MAINTAINER=	FreeBSD@ShaneWare.Biz
@@ -78,6 +76,8 @@ TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cppunit.pc:devel/cppunit
 post-patch:
 	@${REINPLACE_CMD} 's|EXISTS(tar|EXISTS(${LOCALBASE}/lib/libtar.so|g' \
 		${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' \
+		${WRKSRC}/data/i18n/CMakeLists.txt
 
 do-test-TEST-on:
 	cd ${WRKSRC} && ./src/tests/tests
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
index e7fc4a7fc89d..fedde1f8e385 100644
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545690791
-SHA256 (hydrogen-music-hydrogen-1.0.0-beta1-325-g538eaeb9_GH0.tar.gz) = 7fc67932be2a94f351f3842c03fd222fbf98834e15fb1aebb3fafa458c6d1cf7
-SIZE (hydrogen-music-hydrogen-1.0.0-beta1-325-g538eaeb9_GH0.tar.gz) = 11364184
+TIMESTAMP = 1597478300
+SHA256 (hydrogen-music-hydrogen-1.0.0_GH0.tar.gz) = c4eac296a0d20578c274faf7816cf35c16ed43b634d91d2d19686bf9bbfeb970
+SIZE (hydrogen-music-hydrogen-1.0.0_GH0.tar.gz) = 11501728
diff --git a/audio/hydrogen/files/patch-CMakeLists.txt b/audio/hydrogen/files/patch-CMakeLists.txt
index 1d9476197486..7e2682ce70ee 100644
--- a/audio/hydrogen/files/patch-CMakeLists.txt
+++ b/audio/hydrogen/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
 --- CMakeLists.txt.orig	2017-11-21 17:47:16 UTC
 +++ CMakeLists.txt
-@@ -196,6 +196,11 @@ ENDIF()
+@@ -206,6 +206,11 @@ ENDIF()
  FIND_HELPER(LIBARCHIVE libarchive archive.h archive)
  IF( WANT_LIBARCHIVE AND LIBARCHIVE_FOUND)
      SET(WANT_LIBTAR FALSE)
@@ -12,7 +12,7 @@
  ENDIF()
  FIND_HELPER(LIBSNDFILE sndfile sndfile.h sndfile)
  FIND_HELPER(ALSA alsa alsa/asoundlib.h asound )
-@@ -205,6 +210,8 @@ FIND_HELPER(OSC liblo lo/lo.h lo)
+@@ -215,6 +220,8 @@ FIND_HELPER(OSC liblo lo/lo.h lo)
  
  IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
  	FIND_HELPER(OSS oss sys/soundcard.h ossaudio )
@@ -21,12 +21,3 @@
  ELSE()
  	FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
  ENDIF()
-@@ -368,7 +375,7 @@ ENDIF()
- IF(NOT MINGW AND NOT APPLE)
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${H2_UNIX_ICON_PATH}")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps")
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
- ENDIF()
- 
diff --git a/audio/hydrogen/files/patch-data_i18n_CMakeLists.txt b/audio/hydrogen/files/patch-data_i18n_CMakeLists.txt
new file mode 100644
index 000000000000..80a0f147ea7f
--- /dev/null
+++ b/audio/hydrogen/files/patch-data_i18n_CMakeLists.txt
@@ -0,0 +1,8 @@
+--- data/i18n/CMakeLists.txt.orig	2020-08-15 20:14:40 UTC
++++ data/i18n/CMakeLists.txt
+@@ -5,4 +5,4 @@ FILE(GLOB TS_FILES ${CMAKE_CURRENT_LIST_DIR}/*.ts)
+ 
+ QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
+ ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
+-INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
++INSTALL(FILES ${QM_FILES} DESTINATION "%%DATADIR%%/data/i18n")
diff --git a/audio/hydrogen/files/patch-src_gui_src_SplashScreen.cpp b/audio/hydrogen/files/patch-src_gui_src_SplashScreen.cpp
deleted file mode 100644
index 0627ad634170..000000000000
--- a/audio/hydrogen/files/patch-src_gui_src_SplashScreen.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/src/SplashScreen.cpp.orig	2020-06-03 21:33:30 UTC
-+++ src/gui/src/SplashScreen.cpp
-@@ -32,7 +32,7 @@
- const char* SplashScreen::__class_name = "SplashScreen";
- 
- SplashScreen::SplashScreen()
-- : QSplashScreen( NULL )
-+ : QSplashScreen( (QWidget*)nullptr )
-  , Object( __class_name )
- {
- 	//INFOLOG( "SplashScreen" );
diff --git a/audio/hydrogen/pkg-plist b/audio/hydrogen/pkg-plist
index 7260e81a70b2..9c0c94648d57 100644
--- a/audio/hydrogen/pkg-plist
+++ b/audio/hydrogen/pkg-plist
@@ -8,7 +8,7 @@ include/hydrogen/IO/CoreAudioDriver.h
 include/hydrogen/IO/CoreMidiDriver.h
 include/hydrogen/IO/DiskWriterDriver.h
 include/hydrogen/IO/FakeDriver.h
-include/hydrogen/IO/JackAudioDriver.h
+include/hydrogen/IO/jack_audio_driver.h
 include/hydrogen/IO/JackMidiDriver.h
 include/hydrogen/IO/MidiCommon.h
 include/hydrogen/IO/MidiInput.h
@@ -43,7 +43,6 @@ include/hydrogen/core_action_controller.h
 include/hydrogen/event_queue.h
 include/hydrogen/fx/Effects.h
 include/hydrogen/fx/LadspaFX.h
-include/hydrogen/fx/ladspa.h
 include/hydrogen/globals.h
 include/hydrogen/h2_exception.h
 include/hydrogen/helpers/files.h
@@ -69,9 +68,9 @@ include/hydrogen/timeline.h
 include/hydrogen/version.h
 lib/libhydrogen-core-1.0.0.so
 man/man1/hydrogen.1.gz
-share/appdata/hydrogen.appdata.xml
-share/applications/hydrogen.desktop
-share/icons/hicolor/scalable/apps/h2-icon.svg
+share/appdata/org.hydrogenmusic.Hydrogen.appdata.xml
+share/applications/org.hydrogenmusic.Hydrogen.desktop
+share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg
 %%DATADIR%%/data/DefaultSong.h2song
 %%DATADIR%%/data/click.wav
 %%DATADIR%%/data/demo_songs/GM_kit_Diddley.h2song