From bf7031a354dba3cc21a81bf77cf2e0e8c5c41a92 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 2 Jul 2023 20:21:44 +0200 Subject: [PATCH] ocp, fix reference to libpng (#8926) --- media-sound/ocp/ocp-0.2.105.recipe | 29 +++++----- media-sound/ocp/ocp-0.2.2.recipe | 86 ------------------------------ 2 files changed, 14 insertions(+), 101 deletions(-) delete mode 100644 media-sound/ocp/ocp-0.2.2.recipe diff --git a/media-sound/ocp/ocp-0.2.105.recipe b/media-sound/ocp/ocp-0.2.105.recipe index 403d4eb70..74633dfd6 100644 --- a/media-sound/ocp/ocp-0.2.105.recipe +++ b/media-sound/ocp/ocp-0.2.105.recipe @@ -3,7 +3,7 @@ DESCRIPTION="ocp - Open Cubic Player, a music player ported from DOS." HOMEPAGE="https://stian.cubic.org/project-ocp.php" COPYRIGHT="1994-2023 Niklas Beisert, Stian Skjelstad and others" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://stian.cubic.org/ocp/ocp-$portVersion.tar.bz2" CHECKSUM_SHA256="d45d93ee3e95371116b449df7633e926f6c429d6ce1e60912884473b85288277" @@ -37,11 +37,11 @@ REQUIRES=" lib:libiconv$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libncurses$secondaryArchSuffix - lib:libmad$secondaryArchSuffix >= 0.2.1 - lib:libogg$secondaryArchSuffix >= 0.8.0 - lib:libpng$secondaryArchSuffix - lib:libsdl2_2.0$secondaryArchSuffix - lib:libvorbis$secondaryArchSuffix >= 0.4.5 + lib:libmad$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix + lib:libSDL2_2.0$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix lib:libvorbisfile$secondaryArchSuffix lib:libz$secondaryArchSuffix unifont @@ -49,7 +49,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libancient$secondaryArchSuffix >= 2 + devel:libancient$secondaryArchSuffix devel:libbz2$secondaryArchSuffix devel:libcjson$secondaryArchSuffix devel:libdiscid$secondaryArchSuffix @@ -58,11 +58,11 @@ BUILD_REQUIRES=" devel:libiconv$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libncurses$secondaryArchSuffix - devel:libmad$secondaryArchSuffix >= 0.2.1 - devel:libogg$secondaryArchSuffix >= 0.8.0 - devel:libpng$secondaryArchSuffix + devel:libmad$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix devel:libSDL2_2.0$secondaryArchSuffix - devel:libvorbis$secondaryArchSuffix >= 0.4.5 + devel:libvorbis$secondaryArchSuffix devel:libvorbisfile$secondaryArchSuffix devel:libz$secondaryArchSuffix unifont @@ -72,11 +72,9 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix cmd:hexdump - cmd:make - cmd:makeinfo cmd:libtoolize$secondaryArchSuffix + cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:sdl_config$secondaryArchSuffix cmd:xa " @@ -85,8 +83,9 @@ BUILD() libtoolize -vfi chmod +x configure runConfigure --omit-dirs binDir ./configure \ - --without-update-mime-database \ --bindir=$commandBinDir \ + --without-update-mime-database \ + --with-libiconv=yes \ --with-unifontdir-ttf=/system/data/fonts/ttfonts \ --with-unifontdir-otf=/system/data/fonts/otfonts make $jobArgs diff --git a/media-sound/ocp/ocp-0.2.2.recipe b/media-sound/ocp/ocp-0.2.2.recipe deleted file mode 100644 index 2ec0df995..000000000 --- a/media-sound/ocp/ocp-0.2.2.recipe +++ /dev/null @@ -1,86 +0,0 @@ -SUMMARY="Open Cubic Player" -DESCRIPTION="ocp - Open Cubic Player, a music player ported from DOS." -HOMEPAGE="https://stian.cubic.org/project-ocp.php" -COPYRIGHT="1994-2016 Niklas Beisert, Stian Skjelstad and others" -LICENSE="GNU GPL v2" -REVISION="1" -SOURCE_URI="https://stian.cubic.org/ocp/ocp-$portVersion.tar.bz2" -CHECKSUM_SHA256="619f395893fafa6b0f24d98ebc7016eef6e6be53a5e6c63a3481964c1e4f14c9" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. -commandSuffix=$secondaryArchSuffix -commandBinDir=$binDir -if [ "$targetArchitecture" = x86_gcc2 ]; then - commandSuffix= - commandBinDir=$prefix/bin -fi - -PROVIDES=" - ocp$secondaryArchSuffix = $portVersion - cmd:ocp$commandSuffix = $portVersion - cmd:ocp_${portVersion}$commandSuffix = $portVersion - cmd:ocp_curses = $portVersion - cmd:ocp_sdl2 = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libFLAC$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libjpeg$secondaryArchSuffix - lib:libncurses$secondaryArchSuffix - lib:libmad$secondaryArchSuffix >= 0.2.1 - lib:libogg$secondaryArchSuffix >= 0.8.0 - lib:libpng$secondaryArchSuffix - lib:libsdl2_2.0$secondaryArchSuffix - lib:libvorbis$secondaryArchSuffix >= 0.4.5 - lib:libvorbisfile$secondaryArchSuffix - lib:libz$secondaryArchSuffix - unifont - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libFLAC$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libjpeg$secondaryArchSuffix - devel:libncurses$secondaryArchSuffix - devel:libmad$secondaryArchSuffix >= 0.2.1 - devel:libogg$secondaryArchSuffix >= 0.8.0 - devel:libpng$secondaryArchSuffix - devel:libsdl2_2.0$secondaryArchSuffix - devel:libvorbis$secondaryArchSuffix >= 0.4.5 - devel:libvorbisfile$secondaryArchSuffix - devel:libz$secondaryArchSuffix - unifont - " -BUILD_PREREQUIRES=" - cmd:autoconf - cmd:gettext$secondaryArchSuffix - cmd:gcc$secondaryArchSuffix - cmd:hexdump - cmd:make - cmd:makeinfo - cmd:libtoolize$secondaryArchSuffix - cmd:pkg_config$secondaryArchSuffix - cmd:sdl_config$secondaryArchSuffix - cmd:xa - " - -BUILD() -{ - libtoolize -vfi - chmod +x configure - runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir \ - --with-unifontdir=/system/data/fonts/ttfonts - make $jobArgs -} - -INSTALL() -{ - make install -}