diff --git a/media-sound/flacon/flacon-5.2.0.recipe b/media-sound/flacon/flacon-5.5.1.recipe similarity index 95% rename from media-sound/flacon/flacon-5.2.0.recipe rename to media-sound/flacon/flacon-5.5.1.recipe index f583cb704..55aed8eee 100644 --- a/media-sound/flacon/flacon-5.2.0.recipe +++ b/media-sound/flacon/flacon-5.5.1.recipe @@ -5,11 +5,11 @@ To do this, it uses information from the appropriate CUE file. Besides, Flacon makes it possible to conveniently revise or specify tags both \ for all tracks at once or for each tag separately." HOMEPAGE="https://flacon.github.io/" -COPYRIGHT="2012-2015 Alexander Sokoloff" +COPYRIGHT="2012-2019 Alexander Sokoloff" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://github.com/flacon/flacon/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="701fb0ebee98a697baa3060645ca4203771714994bb1fa8eeebfd2274e4704ac" +CHECKSUM_SHA256="bdeac2268536c790ede8928156c7a35019dd05ed1b16f04238394a238950d287" SOURCE_FILENAME="flacon-$portVersion.tar.gz" PATCHES="flacon-$portVersion.patchset" ADDITIONAL_FILES="flacon.rdef.in" diff --git a/media-sound/flacon/patches/flacon-5.2.0.patchset b/media-sound/flacon/patches/flacon-5.2.0.patchset deleted file mode 100644 index 77216e765..000000000 --- a/media-sound/flacon/patches/flacon-5.2.0.patchset +++ /dev/null @@ -1,106 +0,0 @@ -From 7e1ce0df4991297a84eeecc5693152ed372197ab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sat, 28 Apr 2018 19:06:00 +0200 -Subject: Haiku supporting patches - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c7d5467..8240333 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -176,13 +176,28 @@ file (GLOB TS_FILES - translations/flacon*.ts - ) - --set(DATA_DIR -- ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} --) -+if(NOT DEFINED DATA_DIR) -+ set(DATA_DIR -+ ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} -+ ) -+endif() -+ -+if(NOT DEFINED TRANSLATIONS_DIR) -+ set(TRANSLATIONS_DIR -+ "${DATA_DIR}/translations" -+ ) -+endif() -+ -+if(NOT DEFINED MAN_DIR) -+ set(MAN_DIR -+ ${CMAKE_INSTALL_PREFIX}/share/man/man1 -+ ) -+endif() -+ -+if(NOT DEFINED BIN_DIR) -+ set(BIN_DIR bin) -+endif() - --set(TRANSLATIONS_DIR -- "${DATA_DIR}/translations" --) - add_definitions(-DTRANSLATIONS_DIR=\"${TRANSLATIONS_DIR}\") - - set (CMAKE_CXX_STANDARD 11) -@@ -302,30 +317,34 @@ add_custom_command(TARGET ${PROJECT_NAME} - COMMAND gzip -c -n ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz - ) - -- --if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") -- set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon") -- install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION Flacon.app/Contents/MacOS) -- install(FILES ${QM_FILES} DESTINATION Flacon.app/Contents/translations) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION Flacon.app/Contents/Resources) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Info.plist DESTINATION Flacon.app/Contents) -- install(FILES images/mainicon/Flacon.icns DESTINATION Flacon.app/Contents/Resources) -- -+if(NOT HAIKU) -+ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") -+ set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon") -+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION Flacon.app/Contents/MacOS) -+ install(FILES ${QM_FILES} DESTINATION Flacon.app/Contents/translations) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION Flacon.app/Contents/Resources) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Info.plist DESTINATION Flacon.app/Contents) -+ install(FILES images/mainicon/Flacon.icns DESTINATION Flacon.app/Contents/Resources) -+ -+ else() -+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) -+ install(FILES ${QM_FILES} DESTINATION ${TRANSLATIONS_DIR}) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1) -+ -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop DESTINATION "share/applications") -+ install(FILES images/mainicon/flacon-16x16.png DESTINATION "share/icons/hicolor/16x16/apps" RENAME "flacon.png") -+ install(FILES images/mainicon/flacon-32x32.png DESTINATION "share/icons/hicolor/32x32/apps" RENAME "flacon.png") -+ install(FILES images/mainicon/flacon-48x48.png DESTINATION "share/icons/hicolor/48x48/apps" RENAME "flacon.png") -+ install(FILES images/mainicon/flacon-64x64.png DESTINATION "share/icons/hicolor/64x64/apps" RENAME "flacon.png") -+ install(FILES images/mainicon/flacon-128x128.png DESTINATION "share/icons/hicolor/128x128/apps" RENAME "flacon.png") -+ install(FILES images/mainicon/flacon-256x256.png DESTINATION "share/icons/hicolor/256x256/apps" RENAME "flacon.png") -+ install(FILES images/mainicon/flacon-512x512.png DESTINATION "share/icons/hicolor/512x512/apps" RENAME "flacon.png") -+ install(FILES images/mainicon/flacon.svg DESTINATION "share/icons/hicolor/scalable/apps" RENAME "flacon.svg") -+ -+ endif() - else() -- install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) -- install(FILES ${QM_FILES} DESTINATION ${TRANSLATIONS_DIR}) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1) -- -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop DESTINATION "share/applications") -- install(FILES images/mainicon/flacon-16x16.png DESTINATION "share/icons/hicolor/16x16/apps" RENAME "flacon.png") -- install(FILES images/mainicon/flacon-32x32.png DESTINATION "share/icons/hicolor/32x32/apps" RENAME "flacon.png") -- install(FILES images/mainicon/flacon-48x48.png DESTINATION "share/icons/hicolor/48x48/apps" RENAME "flacon.png") -- install(FILES images/mainicon/flacon-64x64.png DESTINATION "share/icons/hicolor/64x64/apps" RENAME "flacon.png") -- install(FILES images/mainicon/flacon-128x128.png DESTINATION "share/icons/hicolor/128x128/apps" RENAME "flacon.png") -- install(FILES images/mainicon/flacon-256x256.png DESTINATION "share/icons/hicolor/256x256/apps" RENAME "flacon.png") -- install(FILES images/mainicon/flacon-512x512.png DESTINATION "share/icons/hicolor/512x512/apps" RENAME "flacon.png") -- install(FILES images/mainicon/flacon.svg DESTINATION "share/icons/hicolor/scalable/apps" RENAME "flacon.svg") -- -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION ${MAN_DIR}) -+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${BIN_DIR}) - endif() - - include("cmake/tests.cmake") --- -2.16.2 - diff --git a/media-sound/flacon/patches/flacon-5.5.1.patchset b/media-sound/flacon/patches/flacon-5.5.1.patchset new file mode 100644 index 000000000..d6ccc6b15 --- /dev/null +++ b/media-sound/flacon/patches/flacon-5.5.1.patchset @@ -0,0 +1,70 @@ +From b47ecb7a4e35c6ec4e1620e8aa7de4916e6e294e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Tue, 1 Oct 2019 19:03:50 +0200 +Subject: [PATCH] Haiku supporting patches + +--- + CMakeLists.txt | 32 ++++++++++++++++++++++++++------ + 1 file changed, 26 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e61a5b9..b428b74 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -195,13 +195,28 @@ file (GLOB TS_FILES + translations/flacon*.ts + ) + +-set(DATA_DIR +- ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} +-) ++if(NOT DEFINED DATA_DIR) ++ set(DATA_DIR ++ ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} ++ ) ++endif() ++ ++if(NOT DEFINED TRANSLATIONS_DIR) ++ set(TRANSLATIONS_DIR ++ "${DATA_DIR}/translations" ++ ) ++endif() ++ ++if(NOT DEFINED MAN_DIR) ++ set(MAN_DIR ++ ${CMAKE_INSTALL_PREFIX}/share/man/man1 ++ ) ++endif() ++ ++if(NOT DEFINED BIN_DIR) ++ set(BIN_DIR bin) ++endif() + +-set(TRANSLATIONS_DIR +- "${DATA_DIR}/translations" +-) + add_definitions(-DTRANSLATIONS_DIR=\"${TRANSLATIONS_DIR}\") + + set (CMAKE_CXX_STANDARD 11) +@@ -338,6 +353,7 @@ add_custom_command(TARGET ${PROJECT_NAME} + ) + + ++if(NOT HAIKU) + if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon") + install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION Flacon.app/Contents/MacOS) +@@ -363,6 +379,10 @@ else() + install(FILES images/mainicon/flacon.svg DESTINATION "share/icons/hicolor/scalable/apps" RENAME "flacon.svg") + + endif() ++else() ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION ${MAN_DIR}) ++ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${BIN_DIR}) ++endif() + + include("cmake/tests.cmake") + add_tests(tests) +-- +2.23.0 +