summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Helmert III <jchelmert3@posteo.net>2020-07-05 22:50:38 -0500
committerSam James <sam@gentoo.org>2020-07-19 23:38:34 +0000
commit6e850373228ff95fb18186bf65f5cf31e127f99e (patch)
tree1b917cb3bf1651814bfb6ff13f962a1b8f28e90a /media-sound
parentmedia-sound/milkytracker: Add 1.02.00 (security) (diff)
downloadgentoo-6e850373228ff95fb18186bf65f5cf31e127f99e.tar.gz
gentoo-6e850373228ff95fb18186bf65f5cf31e127f99e.tar.bz2
gentoo-6e850373228ff95fb18186bf65f5cf31e127f99e.zip
media-sound/milkytracker: Drop 1.0.0
Bug: https://bugs.gentoo.org/711280 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: John Helmert III <jchelmert3@posteo.net> Closes: https://github.com/gentoo/gentoo/pull/16605 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/milkytracker/Manifest1
-rw-r--r--media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch148
-rw-r--r--media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch71
-rw-r--r--media-sound/milkytracker/milkytracker-1.0.0.ebuild46
4 files changed, 0 insertions, 266 deletions
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 34a0214ebc13..ebeb8bcf05c2 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,3 +1,2 @@
-DIST milkytracker-1.0.0.tar.gz 3749140 BLAKE2B 5bf1e374c8d51e7f65a222c46b4cb3e26dd88ba5be304af540d3af4f5123179a2496d0b5eb87021d2dc0f12e7fab3f55e9ad06573aa5fb3a8842d9b743e6c948 SHA512 a96e8b015a4e3b38f3ad44756fc79cb062f91ab193b7428a6abde042aa4e51c8fb45757cba0504283410d714eefffdee57d3e3bf42e7991d1f9581ab8d2ab1c4
DIST milkytracker-1.02.00-cmake.patch 40073 BLAKE2B cef8fc7efff9324c1d628026d650c79e11950b53481686e5dd35ace483839fbdd6b2b1f8ccce2f688beec2c7c28b0fe3b60d0e8d540d6cd163927f4bacf9d396 SHA512 bd4ca0d092229722ca81addaf9eec3ff1b176061da7b44fe3f02fbe020c3820778ed973dde95588b4c9f918728e2c69c24ac23083a2f48c0cbad2e854eeff5ba
DIST milkytracker-1.02.00.tar.gz 3753882 BLAKE2B e9bb4341e016d2a9c518835e8b4620f748da60bca7205302e7500f14f3294e7fa9a20fef203226fffbe22a11a3b4978ea928f0f544eb70e99b5998ecc7c45611 SHA512 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
diff --git a/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch b/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch
deleted file mode 100644
index 391ec55c7d8d..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 87d0f55cd8868d91472f96cccafaf6fdb9e0cbbc Mon Sep 17 00:00:00 2001
-From: Dale Whinham <daleyo@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/files/milkytracker-1.0.0-docdir.patch b/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch
deleted file mode 100644
index aeae02af2b0b..000000000000
--- a/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 56bf091a0e8c5242e160d37f2974f3e1e2525821 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sun, 7 May 2017 10:49:21 +0200
-Subject: [PATCH] Use GNUInstallDirs in order to change installation paths
-
-* This allows distro-specific modification of directories
- to adjust to different FHS layouts.
----
- CMakeLists.txt | 5 ++++-
- docs/CMakeLists.txt | 2 +-
- resources/music/CMakeLists.txt | 2 +-
- src/tracker/CMakeLists.txt | 2 +-
- 4 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 996e2f0..bac54f3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,9 +19,12 @@
- # along with MilkyTracker. If not, see <http://www.gnu.org/licenses/>.
- #
-
--cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 2.8.5)
- project(MilkyTracker)
-
-+# Adhere to GNU filesystem layout conventions
-+include(GNUInstallDirs)
-+
- # Force SDL if requested
- option(FORCESDL "Force SDL instead of native" OFF)
- if(FORCESDL)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 0aacc60..aca4a61 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -35,7 +35,7 @@ elseif(WIN32)
- set(INSTALL_DEST .)
- else()
- list(APPEND DOCUMENTS readme_unix)
-- set(INSTALL_DEST share/doc/${PROJECT_NAME_LOWER})
-+ set(INSTALL_DEST ${CMAKE_INSTALL_DOCDIR})
- endif()
-
- install(FILES ${DOCUMENTS} DESTINATION ${INSTALL_DEST})
-diff --git a/resources/music/CMakeLists.txt b/resources/music/CMakeLists.txt
-index f918b6e..f29fcd6 100644
---- a/resources/music/CMakeLists.txt
-+++ b/resources/music/CMakeLists.txt
-@@ -24,7 +24,7 @@ file(GLOB SONGS "*.xm")
- if(APPLE OR WIN32)
- set(INSTALL_DEST "Example Songs")
- else()
-- set(INSTALL_DEST share/${PROJECT_NAME_LOWER}/songs)
-+ set(INSTALL_DEST ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER}/songs)
- endif()
-
- install(FILES ${SONGS} DESTINATION ${INSTALL_DEST})
-diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
-index 1e4062e..b7a96a7 100644
---- a/src/tracker/CMakeLists.txt
-+++ b/src/tracker/CMakeLists.txt
-@@ -399,7 +399,7 @@ target_link_libraries(
- if(APPLE OR WIN32)
- set(INSTALL_DEST .)
- else()
-- set(INSTALL_DEST bin)
-+ set(INSTALL_DEST ${CMAKE_INSTALL_BINDIR})
- endif()
-
- install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_DEST})
diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
deleted file mode 100644
index 3d5f9f04861d..000000000000
--- a/media-sound/milkytracker/milkytracker-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop
-
-DESCRIPTION="FastTracker 2 inspired music tracker"
-HOMEPAGE="https://milkytracker.titandemo.org/"
-SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa jack"
-
-RDEPEND="
- dev-libs/zziplib
- media-libs/libsdl2[X]
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-docdir.patch
- "${FILESDIR}"/${P}-cmake.patch
-)
-
-S="${WORKDIR}/MilkyTracker-${PV}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package alsa ALSA)
- $(cmake_use_find_package jack JACK)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- newicon resources/pictures/carton.png ${PN}.png
- make_desktop_entry ${PN} MilkyTracker ${PN} \
- "AudioVideo;Audio;Sequencer"
-}