From 1b57a67766a706be68d48091d61cd0ad1c023761 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 6 Nov 2016 06:10:54 +0100 Subject: [PATCH] hydrogen: update to 0.9.7. --- .../hydrogen/patches/cxxflags-from-env.patch | 20 ++++++++++--------- srcpkgs/hydrogen/patches/fix-man-path.patch | 11 ++++++++++ srcpkgs/hydrogen/template | 8 ++++---- 3 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 srcpkgs/hydrogen/patches/fix-man-path.patch diff --git a/srcpkgs/hydrogen/patches/cxxflags-from-env.patch b/srcpkgs/hydrogen/patches/cxxflags-from-env.patch index 9c1218a39fd..f78fc8f9889 100644 --- a/srcpkgs/hydrogen/patches/cxxflags-from-env.patch +++ b/srcpkgs/hydrogen/patches/cxxflags-from-env.patch @@ -1,15 +1,17 @@ ---- CMakeLists.txt.orig 2016-06-11 17:03:52.532568896 +0200 -+++ CMakeLists.txt 2016-06-11 17:04:03.094569441 +0200 -@@ -97,12 +97,6 @@ +--- CMakeLists.txt.orig 2016-11-06 06:11:37.041598678 +0100 ++++ CMakeLists.txt 2016-11-06 06:19:21.978622663 +0100 +@@ -106,10 +106,10 @@ ENDIF() #SET(CMAKE_CXX_FLAGS "-fno-implement-inlines -finline-small-functions -findirect-inlining -fpartial-inlining") --IF(APPLE) -- SET(CMAKE_CXX_FLAGS "-O2") --ELSE() -- SET(CMAKE_CXX_FLAGS "-O2 -fno-implement-inlines") +-SET(CMAKE_CXX_FLAGS "-O2 -std=gnu++11 -Wno-deprecated-register") +-IF (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implement-inlines") -ENDIF() -- ++#SET(CMAKE_CXX_FLAGS "-O2 -std=gnu++11 -Wno-deprecated-register") ++#IF (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implement-inlines") ++#ENDIF() + SET(CMAKE_CXX_FLAGS_RELEASE "") - SET(CMAKE_CXX_FLAGS_DEBUG "-g ")#-Winline") diff --git a/srcpkgs/hydrogen/patches/fix-man-path.patch b/srcpkgs/hydrogen/patches/fix-man-path.patch new file mode 100644 index 00000000000..ee926681d20 --- /dev/null +++ b/srcpkgs/hydrogen/patches/fix-man-path.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2016-11-06 06:21:09.000000000 +0100 ++++ CMakeLists.txt 2016-11-06 06:24:00.389637026 +0100 +@@ -358,7 +358,7 @@ + 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}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1") ++ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1") + ENDIF() + + # diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template index 00f35c35d64..ce4aa205013 100644 --- a/srcpkgs/hydrogen/template +++ b/srcpkgs/hydrogen/template @@ -1,7 +1,7 @@ # Template file for 'hydrogen' pkgname=hydrogen -version=0.9.6.1 -revision=2 +version=0.9.7 +revision=1 build_style=cmake configure_args="-DWANT_LRDF=ON -DWANT_CPPUNIT=OFF" hostmakedepends="pkg-config cmake" @@ -13,6 +13,6 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.hydrogen-music.org/" distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz" -checksum=94dadf433f0abbe7e0ae8e037726b3573f8b59abf118c9c084f06c561d56b66f +checksum=1e0f3d9eae901ef5f11a61e2a446b1d819f3b38e2476a2b382cc02dea693c2b7 -export CXXFLAGS="-fno-implement-inlines" +export CXXFLAGS="-std=gnu++11 -Wno-deprecated-register -fno-implement-inlines"