haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcdio: gcc2 build fix

Browse Source
This commit is contained in:
Jerome Duval
2014-04-19 21:51:10 +00:00
parent f4359dc2fd
commit 37c90828fd
4 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-libs/libcdio/libcdio-0.92.recipe
View File

@@ -16,6 +16,8 @@ REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64" ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="libcdio-0.92.patchset"
PROVIDES=" PROVIDES="
libcdio$secondaryArchSuffix = $portVersion libcdio$secondaryArchSuffix = $portVersion
cmd:cdda_player cmd:cdda_player

20
dev-libs/libcdio/patches/libcdio-0.82.patch
View File

@@ -1,20 +0,0 @@
diff -urN libcdio-0.82/configure.ac libcdio-0.82-haiku/configure.ac
--- libcdio-0.82/configure.ac 2009-10-27 11:26:32.055574528 +0000
+++ libcdio-0.82-haiku/configure.ac 2010-10-05 11:54:28.000000000 +0000
@@ -246,7 +246,7 @@
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
@@ -572,6 +572,7 @@
[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

20
dev-libs/libcdio/patches/libcdio-0.83.patch
View File

@@ -1,20 +0,0 @@
diff -urN libcdio-0.83/configure.ac libcdio-0.83-haiku/configure.ac
--- libcdio-0.83/configure.ac 2009-10-27 11:26:32.055574528 +0000
+++ libcdio-0.83-haiku/configure.ac 2010-10-05 11:54:28.000000000 +0000
@@ -246,7 +246,7 @@
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
@@ -572,6 +572,7 @@
[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

45
dev-libs/libcdio/patches/libcdio-0.92.patchset Normal file
View File

@@ -0,0 +1,45 @@
From 0773ee4a7e18c12b02a7e83fca1c3f9796f61e73 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 19 Apr 2014 21:36:18 +0000
Subject: gcc2 build fix
diff --git a/configure.ac b/configure.ac
index d83b885..de089f1 100755
--- a/configure.ac
+++ b/configure.ac
@@ -241,7 +241,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
@@ -623,6 +623,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/example/mmc1.c b/example/mmc1.c
index 29991e7..66b7a67 100644
--- a/example/mmc1.c
+++ b/example/mmc1.c
@@ -90,9 +90,9 @@ main(int argc, const char *argv[])
{
driver_return_code_t i_status;
bool b_erasable;
+ cdio_mmc_feature_profile_t disctype;
i_status = mmc_get_disc_erasable(p_cdio, &b_erasable);
- cdio_mmc_feature_profile_t disctype;
if (DRIVER_OP_SUCCESS == i_status)
printf("-- Disc is %serasable.\n", b_erasable ? "" : "not ");
else
--
1.8.3.4