haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

libcuefile, cleanup, drop gcc2 support (broken) (#8347)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-04-12 12:10:08 +02:00
committed by GitHub
parent 29569869a6
commit e9ed8279e6
2 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media-libs/libcuefile/libcuefile-475.recipe
View File

@@ -3,14 +3,14 @@ DESCRIPTION="A library to work with CUE files"
HOMEPAGE="https://www.musepack.net/"
COPYRIGHT="1997-2011 Musepack Project"
LICENSE="GNU LGPL v2.1"
REVISION="3"
REVISION="4"
SOURCE_URI="http://files.musepack.net/source/libcuefile_r$portVersion.tar.gz"
CHECKSUM_SHA256="b681ca6772b3f64010d24de57361faecf426ee6182f5969fcf29b3f649133fe7"
SOURCE_DIR="libcuefile_r$portVersion"
PATCHES="libcuefile-$portVersion.patchset"
ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libcuefile$secondaryArchSuffix = $portVersion
@@ -39,13 +39,16 @@ BUILD_PREREQUIRES="
BUILD()
{
cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DLIB_SUFFIX=$secondaryArchSubDir
make $jobArgs
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$prefix \
-DLIB_SUFFIX=$secondaryArchSubDir \
-Wno-dev
make -C build $jobArgs
}
INSTALL()
{
make install
make -C build install
mkdir -p $includeDir
cp -r include/* $includeDir

50
media-libs/libcuefile/patches/libcuefile-475.patchset
View File

@@ -1,35 +1,27 @@
From 06f43009bc5303fda6a3a358b087579650d679d3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 13 Sep 2014 16:35:44 +0200
Subject: gcc2 fixes.
From 1855c7bbae49f66c46a1db7a0e9b8b3c658cfd83 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Wed, 12 Apr 2023 10:19:56 +0200
Subject: Don't build/install the static library
diff --git a/src/cue_parse.c b/src/cue_parse.c
index aae2d53..5d90ef8 100755
--- a/src/cue_parse.c
+++ b/src/cue_parse.c
@@ -1515,10 +1515,11 @@ void yyerror (char *s)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
old mode 100755
new mode 100644
index c07fe0d..1bac1aa
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,7 @@
add_definitions(-DYY_NEVER_INTERACTIVE)
include_directories(${libcuefile_SOURCE_DIR}/include)
Cd *cue_parse (FILE *fp)
{
+ int error = yyparse();
+ Cd* res;
cue_yyin = fp;
yydebug = 0;
-add_library(cuefile-static STATIC cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
-set_target_properties(cuefile-static PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1)
-
add_library(cuefile-shared SHARED cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
set_target_properties(cuefile-shared PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1 VERSION 0.0.0 SOVERSION 0)
- int error = yyparse();
cue_delete_buffer();
if (prev_filename) {
free(prev_filename);
@@ -1533,7 +1534,7 @@ Cd *cue_parse (FILE *fp)
new_filename = 0;
}
- Cd *res = cd;
+ res = cd;
if (error) {
cd_delete(cd);
res = 0;
-install(TARGETS cuefile-static cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
+install(TARGETS cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
--
1.8.3.4
2.37.3