ocp, fix reference to libpng (#8926)

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:libmad$secondaryArchSuffix
-	lib:libogg$secondaryArchSuffix >= 0.8.0
+	lib:libogg$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
-	lib:libsdl2_2.0$secondaryArchSuffix
+	lib:libSDL2_2.0$secondaryArchSuffix
-	lib:libvorbis$secondaryArchSuffix >= 0.4.5
+	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:libmad$secondaryArchSuffix
-	devel:libogg$secondaryArchSuffix >= 0.8.0
+	devel:libogg$secondaryArchSuffix
-	devel:libpng$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

media-sound/ocp/ocp-0.2.2.recipe

@@ -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/<arch>/, 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
-}