Unified
Split
Showing
with
174 additions
and 6 deletions.
- +6 −6 dev-libs/libcdio/{libcdio-2.0.0.recipe → libcdio-2.1.0.recipe}
- +94 −0 dev-libs/libcdio/libcdio1-2.0.0.recipe
- +74 −0 dev-libs/libcdio/patches/libcdio-2.1.0.patchset
| @@ -4,12 +4,12 @@ access. Applications wishing to be oblivious of the OS- and device-dependent \ | ||
| properties of a CD-ROM or of the specific details of various CD-image formats \ | ||
| may benefit from using this library." | ||
| HOMEPAGE="https://www.gnu.org/software/libcdio/" | ||
| COPYRIGHT="2002-2017 Rocky Bernstein and Herbert Valerio Riedel" | ||
| COPYRIGHT="2002-2019 Rocky Bernstein and Herbert Valerio Riedel" | ||
| LICENSE="GNU GPL v3" | ||
| REVISION="2" | ||
| SOURCE_URI="https://ftpmirror.gnu.org/libcdio/libcdio-$portVersion.tar.gz | ||
| https://ftp.gnu.org/gnu/libcdio/libcdio-$portVersion.tar.gz" | ||
| CHECKSUM_SHA256="1b481b5da009bea31db875805665974e2fc568e2b2afa516f4036733657cf958" | ||
| REVISION="1" | ||
| SOURCE_URI="https://ftpmirror.gnu.org/libcdio/libcdio-$portVersion.tar.bz2 | ||
| https://ftp.gnu.org/gnu/libcdio/libcdio-$portVersion.tar.bz2" | ||
| CHECKSUM_SHA256="8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b" | ||
| PATCHES="libcdio-$portVersion.patchset" | ||
|
|
||
| ARCHITECTURES="x86_gcc2 x86 x86_64" | ||
| @@ -22,7 +22,7 @@ libcdioLibs=" | ||
| libiso9660xx | ||
| libudf | ||
| " | ||
| libcdioVersion=18.0.0 | ||
| libcdioVersion=19.0.0 | ||
| libcdioxxVersion=1.0.0 | ||
| libiso9660Version=11.0.0 | ||
| libiso9660xxVersion=0.0.0 | ||
| @@ -0,0 +1,94 @@ | ||
| SUMMARY="A library to encapsulate CD-ROM reading and control" | ||
| DESCRIPTION="The libcdio package contains a library for CD-ROM and CD image \ | ||
| access. Applications wishing to be oblivious of the OS- and device-dependent \ | ||
| properties of a CD-ROM or of the specific details of various CD-image formats \ | ||
| may benefit from using this library." | ||
| HOMEPAGE="https://www.gnu.org/software/libcdio/" | ||
| COPYRIGHT="2002-2017 Rocky Bernstein and Herbert Valerio Riedel" | ||
| LICENSE="GNU GPL v3" | ||
| REVISION="1" | ||
| SOURCE_URI="https://ftpmirror.gnu.org/libcdio/libcdio-$portVersion.tar.gz | ||
| https://ftp.gnu.org/gnu/libcdio/libcdio-$portVersion.tar.gz" | ||
| CHECKSUM_SHA256="1b481b5da009bea31db875805665974e2fc568e2b2afa516f4036733657cf958" | ||
| SOURCE_DIR="libcdio-$portVersion" | ||
| PATCHES="libcdio-$portVersion.patchset" | ||
|
|
||
| ARCHITECTURES="x86_gcc2 x86 x86_64" | ||
| SECONDARY_ARCHITECTURES="x86_gcc2 x86" | ||
|
|
||
| libcdioLibs=" | ||
| libcdio | ||
| " | ||
| libcdioVersion=18.0.0 | ||
| for i in lib $libcdioLibs; do | ||
| eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\"" | ||
| done | ||
|
|
||
| PROVIDES=" | ||
| libcdio1$secondaryArchSuffix = $portVersion | ||
| lib:libcdio$secondaryArchSuffix = $libcdioVersionCompat | ||
| " | ||
| REQUIRES=" | ||
| haiku$secondaryArchSuffix | ||
| lib:libcddb$secondaryArchSuffix | ||
| lib:libiconv$secondaryArchSuffix | ||
| lib:libncurses$secondaryArchSuffix | ||
| " | ||
|
|
||
| PROVIDES_devel=" | ||
| libcdio1${secondaryArchSuffix}_devel = $portVersion | ||
| devel:libcdio$secondaryArchSuffix = $libcdioVersionCompat | ||
| " | ||
| REQUIRES_devel=" | ||
| libcdio1$secondaryArchSuffix == $portVersion base | ||
| " | ||
| CONFLICTS_devel=" | ||
| libcdio${secondaryArchSuffix}_devel | ||
| libcdio0${secondaryArchSuffix}_devel | ||
| " | ||
|
|
||
| BUILD_REQUIRES=" | ||
| haiku${secondaryArchSuffix}_devel | ||
| devel:libcddb$secondaryArchSuffix | ||
| devel:libiconv$secondaryArchSuffix | ||
| devel:libncurses$secondaryArchSuffix | ||
| " | ||
| BUILD_PREREQUIRES=" | ||
| cmd:automake | ||
| cmd:autoreconf | ||
| cmd:gcc$secondaryArchSuffix | ||
| cmd:libtoolize$secondaryArchSuffix | ||
| cmd:make | ||
| cmd:pkg_config$secondaryArchSuffix | ||
| " | ||
|
|
||
| defineDebugInfoPackage libcdio$secondaryArchSuffix \ | ||
| "$libDir"/libcdio.so.$libcdioVersion | ||
|
|
||
| BUILD() | ||
| { | ||
| autoreconf -vfi | ||
| runConfigure ./configure | ||
| make $jobArgs | ||
| } | ||
|
|
||
| INSTALL() | ||
| { | ||
| make install | ||
|
|
||
| rm -f "$libDir"/lib*.la "$documentationDir" "$binDir" \ | ||
| "$libDir\libcdio++*" "$libDir\libiso9660*" "$libDir\libudf*" | ||
|
|
||
| # set up the develop directory correctly | ||
| prepareInstalledDevelLibs ${libcdioLibs//xx/++} | ||
| fixPkgconfig | ||
|
|
||
| # devel package | ||
| packageEntries devel \ | ||
| "$developDir" | ||
| } | ||
|
|
||
| TEST() | ||
| { | ||
| make check | ||
| } |
| @@ -0,0 +1,74 @@ | ||
| From 13e5603c9b1a53bacdd52a0ea42fc4680591aae9 Mon Sep 17 00:00:00 2001 | ||
| From: Jerome Duval <jerome.duval@gmail.com> | ||
| Date: Sat, 19 Apr 2014 21:36:18 +0000 | ||
| Subject: Fix gcc2 build. | ||
|
|
||
|
|
||
| diff --git a/configure.ac b/configure.ac | ||
| index f8f7f7d..dc352ab 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -260,7 +260,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ | ||
| dnl empty_array_size | ||
| AC_MSG_CHECKING([how to create empty arrays]) | ||
|
|
||
| -empty_array_size="xxxx" | ||
| +empty_array_size="xxx" | ||
| AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="") | ||
|
|
||
| if test "x$empty_array_size" = "xxxx"; then | ||
| @@ -645,7 +645,7 @@ if test "x$enable_cddb" != "xno"; then | ||
| ], | ||
| [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net]) | ||
| HAVE_CDDB=no]) | ||
| - AC_CHECK_LIB(socket, connect) | ||
| + AC_CHECK_LIB(network, connect) | ||
| AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname)) | ||
| fi | ||
|
|
||
| diff --git a/lib/driver/abs_path.c b/lib/driver/abs_path.c | ||
| index 2b62956..f3905c8 100644 | ||
| --- a/lib/driver/abs_path.c | ||
| +++ b/lib/driver/abs_path.c | ||
| @@ -93,11 +93,13 @@ cdio_dirname(const char *fname) | ||
| char * | ||
| cdio_abspath(const char *cwd, const char *fname) | ||
| { | ||
| + size_t len; | ||
| + char* result; | ||
| if (isdirsep(*fname)) | ||
| return strdup(fname); | ||
| else { | ||
| - size_t len = strlen(cwd) + strlen(fname) + 2; | ||
| - char* result = calloc(sizeof(char), len); | ||
| + len = strlen(cwd) + strlen(fname) + 2; | ||
| + result = calloc(sizeof(char), len); | ||
| snprintf(result, len, "%s%c%s", | ||
| cwd, CDIO_FILE_SEPARATOR, fname); | ||
| return result; | ||
| -- | ||
| 2.16.4 | ||
|
|
||
|
|
||
| From 7d70318dbf4ec6981ebc51a41e2c87045c92b9aa Mon Sep 17 00:00:00 2001 | ||
| From: begasus <begasus@gmail.com> | ||
| Date: Fri, 31 Aug 2018 18:46:24 +0200 | ||
| Subject: fix realpath for the test | ||
|
|
||
|
|
||
| diff --git a/configure.ac b/configure.ac | ||
| index dc352ab..7486cfd 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -565,7 +565,7 @@ AC_SUBST(LIBCDIO_SOURCE_PATH) | ||
| AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \ | ||
| getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \ | ||
| seteuid setegid snprintf setenv strndup unsetenv tzset sleep \ | ||
| - _stati64 usleep vsnprintf readlink realpath gmtime_r localtime_r] ) | ||
| + _stati64 usleep vsnprintf readlink gmtime_r localtime_r] ) | ||
|
|
||
| # check for timegm() support | ||
| AC_CHECK_FUNC(timegm, AC_DEFINE(HAVE_TIMEGM,1, | ||
| -- | ||
| 2.16.4 | ||
|
|