games-arcade/performous: drop 1.1-r3

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner 2023-01-26 22:02:50 +01:00
parent bcc714937d
commit 276a229fed
No known key found for this signature in database
GPG Key ID: 14644BCDD1535109
10 changed files with 0 additions and 388 deletions

View File

@ -1,4 +1,3 @@
DIST performous-1.1.tar.gz 3965473 BLAKE2B 021660aa785d0535396a75e8c4cc5cc368ba5745b67fae527e7901ef6601d95887206aae7f74b52bf6b3da3e827bfbd3094e8a393917b9936af266b54766b0b2 SHA512 6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1
DIST performous-1.2.0.tar.gz 7240476 BLAKE2B c5c27fc02fe0a17261ad6549492ccc88c7ad213df08f6ec68d86bad9116a2f83eae8ab4b85fc19f63d260b28864fad84c19d55befa81dde7aabedb1c50fef89f SHA512 a8fbbe3768f46915eacb65adcc1592295e4c6a84775ca55def01ebcff2218b1860daee0d4d5fcccc407d8df71da1ac25da667b47dd4a17239041a3d5fbfa1c56
DIST performous-ced-9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e.tar.gz 221300 BLAKE2B 1aa7027c8543725c812e6a066a2a707fa19a79ae2f36c49bc8eaf0d3d6549ae11b365a76b47c1fc851a3c0d1bbafc3ff739fa32c1599a1f1853033de78b27d0c SHA512 6721ae5936a58b8298d175f3875675bfb8249208642eaf2766dc6a62c7db96454d4f95d8c39de0ca862aa3edc741de535af69242f0d2d0b8f7527408ab673089
DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed930d6762716b985f35d64b502bcb8c0310ff830384a652bb1b8a72dea5dd08eebbfd89ae047861bd88e2fc983a863d84 SHA512 2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea

View File

@ -1,52 +0,0 @@
https://bugs.gentoo.org/671594
--- a/game/audio.cc
+++ b/game/audio.cc
@@ -77,7 +77,7 @@
static ptime getTime() { return microsec_clock::universal_time(); }
// Conversion helpers
static double getSeconds(time_duration t) { return 1e-6 * t.total_microseconds(); }
- static time_duration getDuration(double seconds) { return microseconds(1e6 * seconds); }
+ static time_duration getDuration(double seconds) { return microseconds(static_cast<long long>(1e6 * seconds)); }
mutable boost::mutex m_mutex;
ptime m_baseTime; ///< A reference time (corresponds to m_basePos)
@@ -149,7 +149,7 @@
int64_t m_pos; ///< Current sample position
bool m_preview;
AudioClock m_clock;
- time_duration durationOf(int64_t samples) const { return microseconds(1e6 * samples / srate / 2.0); }
+ time_duration durationOf(int64_t samples) const { return microseconds(static_cast<long long>(1e6 * samples / srate / 2.0)); }
public:
bool suppressCenterChannel;
double fadeLevel;
--- a/game/backgrounds.hh
+++ b/game/backgrounds.hh
@@ -7,6 +7,7 @@
#include <boost/scoped_ptr.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/thread.hpp>
+#include <boost/noncopyable.hpp>
#include <vector>
/// songs class for songs screen
--- a/game/songs.hh
+++ b/game/songs.hh
@@ -6,6 +6,7 @@
#include <boost/scoped_ptr.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/thread.hpp>
+#include <boost/noncopyable.hpp>
#include <set>
#include <sstream>
#include <vector>
--- a/game/svg.cc
+++ b/game/svg.cc
@@ -4,6 +4,7 @@
#include "configuration.hh"
#include "../common/image.hh"
+#include <boost/smart_ptr/shared_ptr.hpp>
#include <librsvg/rsvg.h>
#include <iostream>

View File

@ -1,11 +0,0 @@
--- a/game/surface.cc 2021-01-18 14:22:05.876604740 +0300
+++ b/game/surface.cc 2021-01-18 14:23:08.908716258 +0300
@@ -135,7 +135,7 @@
bitmap.resize(1, 1);
target->load(bitmap);
// Ask the loader to retrieve the image
- ldr->push(target, Job(name, boost::bind(&T::load, target, _1)));
+ ldr->push(target, Job(name, boost::bind(&T::load, target, boost::placeholders::_1)));
}
Surface::Surface(fs::path const& filename) { loader(this, filename); }

View File

@ -1,12 +0,0 @@
diff -ru performous-1.0.orig/game/CMakeLists.txt performous-1.0/game/CMakeLists.txt
--- performous-1.0.orig/game/CMakeLists.txt 2014-10-28 19:11:45.000000000 -0400
+++ performous-1.0/game/CMakeLists.txt 2015-03-31 03:01:30.806061643 -0400
@@ -141,7 +141,7 @@
set(BIN_INSTALL .) # Straight to Program Files/Performous with no bin subfolder.
set(SUBSYSTEM_WIN32 WIN32)
else()
- set(BIN_INSTALL bin)
+ set(BIN_INSTALL @GENTOO_BINDIR@)
endif()
# Build main executable

View File

@ -1,11 +0,0 @@
--- a/common/image.cc
+++ b/common/image.cc
@@ -180,7 +180,7 @@
}
jpeg_create_decompress(&cinfo);
jpeg_mem_src(&cinfo, data.data(), data.size());
- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string());
+ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string());
jpeg_start_decompress(&cinfo);
bitmap.resize(cinfo.output_width, cinfo.output_height);
unsigned stride = (bitmap.width * 3 + 3) & ~3; // Number of bytes per row (word-aligned)

View File

@ -1,18 +0,0 @@
diff -ru performous-1.0.orig/lang/CMakeLists.txt performous-1.0/lang/CMakeLists.txt
--- performous-1.0.orig/lang/CMakeLists.txt 2014-10-28 19:11:45.000000000 -0400
+++ performous-1.0/lang/CMakeLists.txt 2015-02-22 04:25:40.502252942 -0500
@@ -9,5 +9,13 @@
file(MAKE_DIRECTORY "${mobuild}")
add_custom_command(OUTPUT "${mofile}" COMMAND "${Msgfmt_BIN}" -v "${pofile}" -o "${mofile}" MAIN_DEPENDENCY "${pofile}" COMMENT "Building ${language} locale" VERBATIM)
add_custom_target("locale_${language}" ALL DEPENDS "${mofile}") # Make sure the mofiles are always built
- install(FILES "${mofile}" DESTINATION "${LOCALE_DIR}/${language}/LC_MESSAGES")
endforeach(language)
+foreach(language $ENV{LINGUAS})
+ set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po)
+ if (EXISTS ${pofile})
+ set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
+ install(FILES ${mofile} DESTINATION
+{LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo)
+ endif()
+endforeach(language)
+

View File

@ -1,59 +0,0 @@
--- a/docs/man/CMakeLists.txt 2018-10-14 19:57:14.924572577 +0200
+++ b/docs/man/CMakeLists.txt 2018-10-14 20:11:13.250717230 +0200
@@ -1,14 +1,12 @@
find_program(HELP2MAN help2man DOC "Location of the help2man program")
-find_program(GZIP gzip DOC "Location of the gzip program")
mark_as_advanced(HELP2MAN)
-mark_as_advanced(GZIP)
-if(HELP2MAN AND GZIP)
- set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6.gz)
+if(HELP2MAN)
+ set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6)
set(H2MFILE ${CMAKE_CURRENT_SOURCE_DIR}/performous.h2m)
set(PERFORMOUS_EXEC ${CMAKE_BINARY_DIR}/performous)
add_custom_command(
OUTPUT ${MANFILE}
- COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N | ${GZIP} > ${MANFILE}
+ COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N > ${MANFILE}
MAIN_DEPENDENCY ${H2MFILE}
DEPENDS ${PERFORMOUS_EXEC}
COMMENT "Building Performous man page"
@@ -17,13 +15,13 @@
add_custom_target(manpage ALL DEPENDS ${MANFILE})
iF (APPLE)
install(FILES ${MANFILE} DESTINATION Resources/man/man6)
- else(APPLE)
+ else()
install(FILES ${MANFILE} DESTINATION share/man/man6)
endif()
-else(HELP2MAN AND GZIP)
- message("WARNING: One of the following is missing: help2man, gzip; performous man page will not be generated")
-endif(HELP2MAN AND GZIP)
-if(ENABLE_TOOLS AND GZIP)
+else()
+ message("WARNING: help2man is missing; performous man page will not be generated")
+endif()
+if(ENABLE_TOOLS)
set(TOOLS
"ss_pak_extract" "ss_extract" "ss_cover_conv"
"ss_adpcm_decode" "ss_ipu_conv" "ss_chc_decode"
@@ -31,15 +29,7 @@
set(MAN_SECTION "1")
foreach(TOOL ${TOOLS})
set(TOOL_MANFILE ${CMAKE_CURRENT_SOURCE_DIR}/${TOOL}.${MAN_SECTION})
- set(TOOL_MANFILE_GZ ${CMAKE_CURRENT_BINARY_DIR}/${TOOL}.${MAN_SECTION}.gz)
- add_custom_command(
- OUTPUT ${TOOL_MANFILE_GZ}
- COMMAND ${GZIP} -c ${TOOL_MANFILE} > ${TOOL_MANFILE_GZ}
- MAIN_DEPENDENCY ${TOOL_MANFILE}
- COMMENT "Building ${TOOL} man page"
- VERBATIM
- )
- add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS ${TOOL_MANFILE_GZ})
- install(FILES ${TOOL_MANFILE_GZ} DESTINATION share/man/man${MAN_SECTION})
- endforeach(TOOL)
-endif(ENABLE_TOOLS AND GZIP)
+ add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS ${TOOL_MANFILE})
+ install(FILES ${TOOL_MANFILE} DESTINATION share/man/man${MAN_SECTION})
+ endforeach()
+endif()

View File

@ -1,113 +0,0 @@
From caea553262e1d40bf9caec84223b5d25989464c0 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 25 Mar 2020 14:17:06 +0000
Subject: [PATCH] Rely on pkg-config to find Pango
Fixes build with pango that needs -I/usr/include/harfbuzz (as specified in its
pkg config).
PkgConfig results can be overridded by setting e.g. Pango_PKGCONF_INCLUDEDIR,
Pango_PKGCONF_LDFLAGS (see FindPkgConfig documentation).
IMPORTED_TARGET was added in CMake 3.6.
Fixes #490
Closes #493
---
CMakeLists.txt | 2 +-
cmake/Modules/FindPango.cmake | 25 ++---------------------
cmake/Modules/FindPangoCairo.cmake | 32 ++++--------------------------
3 files changed, 7 insertions(+), 52 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6e72942d..ca7ae4e92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6)
project(Performous CXX C)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
diff --git a/cmake/Modules/FindPango.cmake b/cmake/Modules/FindPango.cmake
index bdddb9e03..42cb199cc 100644
--- a/cmake/Modules/FindPango.cmake
+++ b/cmake/Modules/FindPango.cmake
@@ -2,31 +2,10 @@
# Once done, this will define
#
# Pango_FOUND - system has Pango
-# Pango_INCLUDE_DIRS - the Pango include directories
# Pango_LIBRARIES - link these to use Pango
include(LibFindMacros)
-# Dependencies
-libfind_package(Pango Freetype)
-libfind_package(Pango Glib)
-libfind_package(Pango GObject)
-
-# Use pkg-config to get hints about paths
-libfind_pkg_check_modules(Pango_PKGCONF pango)
-
-# Include dir
-find_path(Pango_INCLUDE_DIR
- NAMES pango/pango.h
- HINTS ${Pango_PKGCONF_INCLUDE_DIRS}
- PATH_SUFFIXES pango-1.0
-)
-
-# Finally the library itself
-find_library(Pango_LIBRARY
- NAMES pango-1.0
- HINTS ${Pango_PKGCONF_LIBRARY_DIRS}
-)
-
+libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango)
+set(Pango_LIBRARY PkgConfig::Pango_PKGCONF)
libfind_process(Pango)
-
diff --git a/cmake/Modules/FindPangoCairo.cmake b/cmake/Modules/FindPangoCairo.cmake
index a26f83bd0..1c1a9e843 100644
--- a/cmake/Modules/FindPangoCairo.cmake
+++ b/cmake/Modules/FindPangoCairo.cmake
@@ -1,35 +1,11 @@
# - Try to find PangoCairo
# Once done, this will define
#
-# PangoCairo_FOUND - system has Pango
-# PangoCairo_INCLUDE_DIRS - the Pango include directories
-# PangoCairo_LIBRARIES - link these to use Pango
+# PangoCairo_FOUND - system has PangoCairo
+# PangoCairo_LIBRARIES - link these to use PangoCairo
include(LibFindMacros)
-# Dependencies
-libfind_package(PangoCairo Pango)
-libfind_package(PangoCairo Cairo)
-
-# Use pkg-config to get hints about paths
-libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo)
-
-# Include dir
-find_path(PangoCairo_INCLUDE_DIR
- NAMES pango/pangocairo.h
- HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS}
- PATH_SUFFIXES pango-1.0
-)
-
-# Finally the library itself
-find_library(PangoCairo_LIBRARY
- NAMES pangocairo-1.0
- HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS}
-)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR)
-set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY)
+libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo)
+set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF)
libfind_process(PangoCairo)
-

View File

@ -11,7 +11,6 @@
<use>
<flag name="midi">Enable MIDI I/O support</flag>
<flag name="songs">Install a few demo songs</flag>
<flag name="tools">Enable building of song extraction utilities for SingStar and Guitar Hero</flag>
<flag name="webcam">Enable Webcam support</flag>
</use>
<upstream>

View File

@ -1,110 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_REMOVE_MODULES_LIST=( FindALSA FindBoost FindFreetype FindGettext FindJpeg FindPng FindTiff FindZ )
inherit cmake desktop xdg-utils
DESCRIPTION="SingStar GPL clone"
HOMEPAGE="https://performous.org/"
SONGS_PN="ultrastar-songs"
SRC_URI="https://github.com/performous/performous/archive/${PV}.tar.gz -> ${P}.tar.gz
songs? (
mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip
mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip
mirror://sourceforge/performous/${SONGS_PN}-libre-3.zip
mirror://sourceforge/performous/${SONGS_PN}-shearer-1.zip
)
"
LICENSE="GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="midi songs tools webcam"
RDEPEND="
dev-cpp/glibmm:2
dev-cpp/libxmlpp:2.6
dev-libs/boost:=
dev-libs/glib:2
dev-libs/libxml2:2
gnome-base/librsvg:2
media-gfx/imagemagick:0=
media-libs/libepoxy
media-libs/libpng:0=
media-libs/libsdl2[joystick,video]
media-libs/portaudio
sys-libs/zlib
media-video/ffmpeg
virtual/glu
virtual/jpeg:0
virtual/libintl
virtual/opengl
x11-libs/cairo
x11-libs/gdk-pixbuf
x11-libs/pango
midi? ( media-libs/portmidi )
webcam? ( media-libs/opencv )
"
DEPEND="${RDEPEND}"
BDEPEND="
sys-apps/help2man
sys-devel/gettext
songs? ( app-arch/unzip )
"
DOCS=( docs/{Authors,instruments}.txt )
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-linguas.patch
"${FILESDIR}"/${P}-nomancompress.patch
"${FILESDIR}"/${P}-jpeg-9c.patch
"${FILESDIR}"/${P}-boost-1.70.patch
"${FILESDIR}"/${P}-boost-1.73.patch
"${FILESDIR}"/${P}-pango-use-pkgconfig.patch
)
src_prepare() {
cmake_src_prepare
sed -i \
-e "s:@GENTOO_BINDIR@:/usr/bin:" \
-e '/ Z /s/ Z/ ZLIB/g' \
-e 's/Z_FOUND/ZLIB_FOUND/g' \
-e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \
-e 's/Jpeg/JPEG/' \
-e 's/Png/PNG/' \
{game,tools}/CMakeLists.txt || die
}
src_configure() {
local mycmakeargs=(
-DENABLE_TOOLS=$(usex tools)
-DENABLE_WEBCAM=$(usex webcam)
-DENABLE_MIDI=$(usex midi)
-DCMAKE_VERBOSE_MAKEFILE=TRUE
-DSHARE_INSTALL="/usr/share/${PN}"
)
cmake_src_configure
}
src_install() {
cmake_src_install
if use songs ; then
insinto "/usr/share/${PN}"
doins -r "${WORKDIR}/songs"
fi
newicon -s scalable data/themes/default/icon.svg ${PN}.svg
}
pkg_postinst() {
xdg_icon_cache_update
}
pkg_postrm() {
xdg_icon_cache_update
}