commit: a0a0d74e043187609c8e560053a29685121f8219 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Dec 7 15:55:39 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Dec 7 15:56:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a0d74e
media-sound/milkytracker: Add upstream cmake fix Closes: https://bugs.gentoo.org/676128 Package-Manager: Portage-2.3.81, Repoman-2.3.19 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/milkytracker-1.0.0-cmake.patch | 148 +++++++++++++++++++++ media-sound/milkytracker/milkytracker-1.0.0.ebuild | 5 +- 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch b/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch new file mode 100644 index 00000000000..391ec55c7d8 --- /dev/null +++ b/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch @@ -0,0 +1,148 @@ +From 87d0f55cd8868d91472f96cccafaf6fdb9e0cbbc Mon Sep 17 00:00:00 2001 +From: Dale Whinham <dal...@gmail.com> +Date: Thu, 31 Oct 2019 21:21:28 +0000 +Subject: [PATCH] CMake: Use SDL2's official CMake package mechanism + +We shouldn't need to rely on a FindSDL2.cmake, as SDL2 comes with a +CMake package definition that should be installed by the distro into a +location where CMake can find it. + +Fixes #168. +--- + CMakeLists.txt | 4 +- + cmake/FindSDL2.cmake | 104 ------------------------------------------- + 2 files changed, 1 insertion(+), 107 deletions(-) + delete mode 100644 cmake/FindSDL2.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27ad4a18..5b6ed9f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,8 +31,6 @@ if(FORCESDL) + unset(APPLE) + unset(WIN32) + add_definitions(-D__FORCE_SDL_AUDIO__) +- # Frameworks not supported by findSDL2.cmake +- set(CMAKE_FIND_FRAMEWORK NEVER) + endif() + + # Lowercase project name for binaries and packaging +@@ -166,7 +164,7 @@ else() + # https://bugzilla.libsdl.org/show_bug.cgi?id=3295 + cmake_policy(SET CMP0004 OLD) + +- find_package(SDL2 2 REQUIRED) ++ find_package(SDL2 REQUIRED) + endif() + + # Prefer static linkage under OS X for libraries located with find_package() +diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake +deleted file mode 100644 +index 27c78f05..00000000 +--- a/cmake/FindSDL2.cmake ++++ /dev/null +@@ -1,104 +0,0 @@ +-# - Find SDL2 library and headers +-# +-# Find module for SDL 2.0 (http://www.libsdl.org/). +-# It defines the following variables: +-# SDL2_INCLUDE_DIRS - The location of the headers, e.g., SDL.h. +-# SDL2_LIBRARIES - The libraries to link against to use SDL2. +-# SDL2_FOUND - If false, do not try to use SDL2. +-# SDL2_VERSION_STRING - Human-readable string containing the version of SDL2. +-# +-# This module responds to the the flag: +-# SDL2_BUILDING_LIBRARY +-# If this is defined, then no SDL2_main will be linked in because +-# only applications need main(). +-# Otherwise, it is assumed you are building an application and this +-# module will attempt to locate and set the the proper link flags +-# as part of the returned SDL2_LIBRARIES variable. +-# +-# Also defined, but not for general use are: +-# SDL2_INCLUDE_DIR - The directory that contains SDL.h. +-# SDL2_LIBRARY - The location of the SDL2 library. +-# SDL2MAIN_LIBRARY - The location of the SDL2main library. +-# +- +-#============================================================================= +-# Copyright 2013 Benjamin Eikel +-# +-# Redistribution and use in source and binary forms, with or without +-# modification, are permitted provided that the following conditions are met: +-# * Redistributions of source code must retain the above copyright +-# notice, this list of conditions and the following disclaimer. +-# * Redistributions in binary form must reproduce the above copyright +-# notice, this list of conditions and the following disclaimer in the +-# documentation and/or other materials provided with the distribution. +-# * Neither the name of the <organization> nor the +-# names of its contributors may be used to endorse or promote products +-# derived from this software without specific prior written permission. +-# +-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +-# ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY +-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-#============================================================================= +- +-find_package(PkgConfig QUIET) +-pkg_check_modules(PC_SDL2 QUIET sdl2) +- +-find_path(SDL2_INCLUDE_DIR +- NAMES SDL.h +- HINTS +- ${PC_SDL2_INCLUDEDIR} +- ${PC_SDL2_INCLUDE_DIRS} +- PATH_SUFFIXES SDL2 +-) +- +-find_library(SDL2_LIBRARY +- NAMES SDL2 +- HINTS +- ${PC_SDL2_LIBDIR} +- ${PC_SDL2_LIBRARY_DIRS} +- PATH_SUFFIXES x64 x86 +-) +- +-if(NOT SDL2_BUILDING_LIBRARY) +- find_library(SDL2MAIN_LIBRARY +- NAMES SDL2main +- HINTS +- ${PC_SDL2_LIBDIR} +- ${PC_SDL2_LIBRARY_DIRS} +- PATH_SUFFIXES x64 x86 +- ) +-endif() +- +-if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h") +- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$") +- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$") +- file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$") +- string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}") +- string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}") +- string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}") +- set(SDL2_VERSION_STRING ${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH}) +- unset(SDL2_VERSION_MAJOR_LINE) +- unset(SDL2_VERSION_MINOR_LINE) +- unset(SDL2_VERSION_PATCH_LINE) +- unset(SDL2_VERSION_MAJOR) +- unset(SDL2_VERSION_MINOR) +- unset(SDL2_VERSION_PATCH) +-endif() +- +-set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) +-set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY}) +- +-include(FindPackageHandleStandardArgs) +- +-find_package_handle_standard_args(SDL2 +- REQUIRED_VARS SDL2_INCLUDE_DIR SDL2_LIBRARY +- VERSION_VAR SDL2_VERSION_STRING) +- +-mark_as_advanced(SDL2_INCLUDE_DIR SDL2_LIBRARY) diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild index cf204b74101..f2fac2cf642 100644 --- a/media-sound/milkytracker/milkytracker-1.0.0.ebuild +++ b/media-sound/milkytracker/milkytracker-1.0.0.ebuild @@ -22,7 +22,10 @@ RDEPEND=" jack? ( media-sound/jack-audio-connection-kit )" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-1.0.0-docdir.patch ) +PATCHES=( + "${FILESDIR}"/${P}-docdir.patch + "${FILESDIR}"/${P}-cmake.patch +) S="${WORKDIR}/MilkyTracker-${PV}"
