diff --git a/media-sound/mpg123/mpg123-1.12.1.recipe b/media-sound/mpg123/mpg123-1.22.0.recipe similarity index 63% rename from media-sound/mpg123/mpg123-1.12.1.recipe rename to media-sound/mpg123/mpg123-1.22.0.recipe index df56242fd..0525497f1 100644 --- a/media-sound/mpg123/mpg123-1.12.1.recipe +++ b/media-sound/mpg123/mpg123-1.22.0.recipe @@ -4,25 +4,34 @@ mpg123 is the fast and Free console based real time MPEG Audio Player for \ Layer 1, 2 and 3. " HOMEPAGE="http://www.mpg123.org/" -SRC_URI="http://sourceforge.net/projects/mpg123/files/mpg123/1.12.1/mpg123-1.12.1.tar.bz2/download" -CHECKSUM_SHA256="f3cfe305832c4a6a56d105ec1b47e7963d5d809cb17447ee93ae2330f2365a72" -REVISION="2" -ARCHITECTURES="x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86" -#DEPEND="media-libs/libsdl >= 1.2" +SRC_URI="http://sourceforge.net/projects/mpg123/files/mpg123/$portVersion/mpg123-$portVersion.tar.bz2" +CHECKSUM_SHA256="25244c07dcb1df0a94092d94126c4172918739fe0e78faaaf97cf0b0fcc1a800" +REVISION="1" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1995-2009 Michael Hipp and others" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" + +PATCHES="mpg123-$portVersion.patchset" PROVIDES=" mpg123$secondaryArchSuffix = $portVersion - lib:libmpg123$secondaryArchSuffix + lib:libmpg123$secondaryArchSuffix = 0.41.0 compat >= 0 cmd:mpg123$secondaryArchSuffix + cmd:mpg123_id3dump$secondaryArchSuffix + cmd:mpg123_strip$secondaryArchSuffix + cmd:out123$secondaryArchSuffix " REQUIRES=" haiku$secondaryArchSuffix + lib:libltdl$secondaryArchSuffix " -BUILD_PREREQUIRES=" +BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make @@ -34,12 +43,10 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCHES="mpg123-1.12.1.patch" BUILD() { sed -i "s,AM_CONFIG_HEADER,AC_CONFIG_HEADERS," configure.ac - libtoolize --force --copy --install - autoreconf --force --install + autoreconf -fi LDFLAGS="-lnetwork" runConfigure ./configure --disable-aligncheck make $jobArgs } @@ -54,14 +61,10 @@ INSTALL() PROVIDES_devel=" mpg123${secondaryArchSuffix}_devel = $portVersion - devel:libmpg123$secondaryArchSuffix + devel:libmpg123$secondaryArchSuffix = 0.41.0 compat >= 0 " REQUIRES_devel=" haiku$secondaryArchSuffix mpg123$secondaryArchSuffix == $portVersion base " - - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1995-2009 Michael Hipp and others" diff --git a/media-sound/mpg123/patches/mpg123-1.12.1.patch b/media-sound/mpg123/patches/mpg123-1.22.0.patchset similarity index 68% rename from media-sound/mpg123/patches/mpg123-1.12.1.patch rename to media-sound/mpg123/patches/mpg123-1.22.0.patchset index 5644a1291..5cfb4abe5 100644 --- a/media-sound/mpg123/patches/mpg123-1.12.1.patch +++ b/media-sound/mpg123/patches/mpg123-1.22.0.patchset @@ -1,20 +1,28 @@ -diff -urN mpg123-1.12.1/configure.ac mpg123-1.12.1-haiku/configure.ac ---- mpg123-1.12.1/configure.ac 2010-03-31 08:27:37.061603840 +0000 -+++ mpg123-1.12.1-haiku/configure.ac 2010-05-31 20:43:38.656932864 +0000 -@@ -545,10 +545,10 @@ +From 13cd20f3e8452b232ea6b2da3f53355eec866d7f Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 5 Mar 2015 18:49:00 +0000 +Subject: Haiku patch + + +diff --git a/configure.ac b/configure.ac +index f93239c..c02aa90 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -567,11 +567,11 @@ case $host in ;; esac ;; - i?86-*-dragonfly* | i?86-*-freebsd* | i?86-*-midnightbsd* | i?86-*-mirbsd* | i?86-*-netbsd* | i?86-*-openbsd*) + i?86-*-dragonfly* | i?86-*-freebsd* | i?86-*-midnightbsd* | i?86-*-mirbsd* | i?86-*-netbsd* | i?86-*-openbsd* | i?86-*-haiku*) cpu_type="x86" + newoldwritesample=enabled ;; - x86_64-*-dragonfly* | x86_64-*-freebsd* | x86_64-*-midnightbsd* | x86_64-*-mirbsd* | x86_64-*-netbsd* | x86_64-*-openbsd*) + x86_64-*-dragonfly* | x86_64-*-freebsd* | x86_64-*-midnightbsd* | x86_64-*-mirbsd* | x86_64-*-netbsd* | x86_64-*-openbsd* | x86_64-*-haiku*) - cpu_type="x86-64_all" + cpu_type="x86-64" ;; *-*-dragonfly* | *-*-freebsd* | *-*-midnightbsd* | *-*-mirbsd* | *-*-netbsd* | *-*-openbsd*) -@@ -963,7 +963,7 @@ +@@ -1108,7 +1108,7 @@ else fi dnl trying to get that socket lib settled in one line @@ -23,3 +31,6 @@ diff -urN mpg123-1.12.1/configure.ac mpg123-1.12.1-haiku/configure.ac dnl OK, two lines... Solaris needs -lnsl -lsocket AC_SEARCH_LIBS(socket, socket) +-- +1.8.3.4 +