haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcddb: prepare for secondary arch.

Browse Source
This commit is contained in:
Adrien Destugues
2014-09-10 22:56:38 +02:00
parent 7acc7ba7f5
commit 3d0f47215b
2 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media-libs/libcddb/libcddb-1.3.2.recipe
View File

@@ -5,23 +5,22 @@ SRC_URI="http://prdownloads.sourceforge.net/libcddb/libcddb-1.3.2.tar.bz2"
CHECKSUM_SHA256="35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b"
REVISION="1"
ARCHITECTURES="x86 x86_gcc2 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmd:cddb_query
bin:cddb_query
libcddb${secondaryArchSuffix} = $portVersion
lib:libcddb
libcddb$secondaryArchSuffix = $portVersion
cmd:cddb_query$secondaryArchSuffix
lib:libcddb$secondaryArchSuffix
"
REQUIRES="
haiku${secondaryArchSuffix} >= $haikuVersion
lib:libintl
lib:libiconv
lib:libintl$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
"
BUILD_REQUIRES="
lib:libiconv
cmd:pkg_config
devel:libiconv$secondaryArchSuffix
"
BUILD_PREREQUIRES="
@@ -34,7 +33,7 @@ BUILD_PREREQUIRES="
cmd:libtool
cmd:ld$secondaryArchSuffix
cmd:make
devel:libiconv
cmd:pkg_config$secondaryArchSuffix
"
PATCH()

42
media-libs/libcddb/patches/libcddb-1.3.2.patchset Normal file
View File

@@ -0,0 +1,42 @@
From 738970bd4ae646170a3431029cc1261e569919e4 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sat, 30 Aug 2014 19:13:37 +0200
Subject: Move cddb cache to B_USER_CACHE_DIRECTORY.
diff --git a/lib/cddb_conn.c b/lib/cddb_conn.c
index 5ca4f7c..aca8de8 100644
--- a/lib/cddb_conn.c
+++ b/lib/cddb_conn.c
@@ -45,6 +45,9 @@
#include <unistd.h>
#endif
+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#endif
/* --- prototypes --- */
@@ -99,9 +102,18 @@ cddb_conn_t *cddb_new(void)
c->use_cache = CACHE_ON;
/* construct cache dir '$HOME/[DEFAULT_CACHE]' */
+#ifdef __HAIKU__
+ {
+ char buf[512];
+ find_directory(B_USER_CACHE_DIRECTORY, 0, false, buf, 512);
+ c->cache_dir = (char*)malloc(strlen(buf) + 1 + sizeof(DEFAULT_CACHE) + 1);
+ sprintf(c->cache_dir, "%s/%s", buf, DEFAULT_CACHE);
+ }
+#else
s = getenv("HOME");
c->cache_dir = (char*)malloc(strlen(s) + 1 + sizeof(DEFAULT_CACHE) + 1);
sprintf(c->cache_dir, "%s/%s", s, DEFAULT_CACHE);
+#endif
c->cache_read = FALSE;
/* use anonymous@localhost */
--
1.8.3.4