Attachment #255122 for bug #282692

Lines 1220-1225 Link Here

(-)b/devel/Makefile (+1 lines)
1220	SUBDIR += libcdb	1220	SUBDIR += libcdb
1221	SUBDIR += libcds	1221	SUBDIR += libcds
1222	SUBDIR += libcfu	1222	SUBDIR += libcfu
		1223	SUBDIR += libchdr
1223	SUBDIR += libchipcard	1224	SUBDIR += libchipcard
1224	SUBDIR += libcidr	1225	SUBDIR += libcidr
1225	SUBDIR += libcii	1226	SUBDIR += libcii




PORTNAME=	libchdr
DISTVERSION=	g20241111
CATEGORIES=	devel

MAINTAINER=	bsdcode@disroot.org
COMMENT=	Standalone library for reading MAME CHDv1-v5 formats
WWW=		https://github.com/rtissera/libchdr

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE.txt

LIB_DEPENDS=	libzstd.so:archivers/zstd

USES=		cmake pathfix pkgconfig
USE_GITHUB=	yes
GH_ACCOUNT=	rtissera
GH_TAGNAME=	b3974651d869c2f804e9879b063c23280d2ae617
USE_LDCONFIG=	yes

CMAKE_ARGS=	-DBUILD_LTO=${defined(WITH_LTO):?ON:OFF}
CMAKE_ON=	INSTALL_STATIC_LIBS WITH_SYSTEM_ZLIB WITH_SYSTEM_ZSTD

post-install:
	${RLN} libchdr-static.a ${STAGEDIR}${PREFIX}/lib/libchdr.a

.include <bsd.port.mk>

Added Link Here

(-)b/devel/libchdr/distinfo (+3 lines)
1	TIMESTAMP = 1731325563
2	SHA256 (rtissera-libchdr-g20241111-b3974651d869c2f804e9879b063c23280d2ae617_GH0.tar.gz) = e17270412aaa7158073ec6d8e6287f80a64354ba2b4edbd5786f2d8571f9e787
3	SIZE (rtissera-libchdr-g20241111-b3974651d869c2f804e9879b063c23280d2ae617_GH0.tar.gz) = 4222329




--- CMakeLists.txt.orig	2024-11-12 19:29:11 UTC
+++ CMakeLists.txt
@@ -51,8 +51,12 @@ if (WITH_SYSTEM_ZSTD)
 
 # zstd
 if (WITH_SYSTEM_ZSTD)
-  find_package(zstd REQUIRED)
-  list(APPEND PLATFORM_LIBS zstd::libzstd_shared)
+  # find_package(zstd) fails on i386 because of a known problem with the
+  # provided cmake module. Use pkg_check_modules instead.
+  find_package(PkgConfig REQUIRED)
+  pkg_check_modules(zstd REQUIRED libzstd)
+  list(APPEND CHDR_INCLUDES ${zstd_INCLUDE_DIRS})
+  list(APPEND PLATFORM_LIBS ${zstd_LINK_LIBRARIES})
 else()
   option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
   option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
@@ -83,7 +87,7 @@ if (INSTALL_STATIC_LIBS)
 endif()
 
 if (INSTALL_STATIC_LIBS)
-  install(TARGETS chdr-static ${CHDR_LIBS}
+  install(TARGETS chdr-static
     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
   )
 endif()

Added Link Here

(-)b/devel/libchdr/pkg-descr (+5 lines)
1	libchdr is a standalone library for reading MAME's CHDv1-v5 formats.
2
3	The code is based off of MAME's old C codebase which read up to CHDv4 with
4	OS-dependent features removed, and CHDv5 support backported from MAME's current
5	C++ codebase.




include/libchdr/bitstream.h
include/libchdr/cdrom.h
include/libchdr/chd.h
include/libchdr/chdconfig.h
include/libchdr/coretypes.h
include/libchdr/flac.h
include/libchdr/huffman.h
lib/libchdr-static.a
lib/libchdr.a
lib/libchdr.so
lib/libchdr.so.0
lib/libchdr.so.0.2
libdata/pkgconfig/libchdr.pc

Return to bug 282692

Added Link Here

(-)b/devel/libchdr/Makefile (+26 lines)
1	PORTNAME= libchdr
2	DISTVERSION= g20241111
3	CATEGORIES= devel
4
5	MAINTAINER= bsdcode@disroot.org
6	COMMENT= Standalone library for reading MAME CHDv1-v5 formats
7	WWW= https://github.com/rtissera/libchdr
8
9	LICENSE= BSD3CLAUSE
10	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
11
12	LIB_DEPENDS= libzstd.so:archivers/zstd
13
14	USES= cmake pathfix pkgconfig
15	USE_GITHUB= yes
16	GH_ACCOUNT= rtissera
17	GH_TAGNAME= b3974651d869c2f804e9879b063c23280d2ae617
18	USE_LDCONFIG= yes
19
20	CMAKE_ARGS= -DBUILD_LTO=${defined(WITH_LTO):?ON:OFF}
21	CMAKE_ON= INSTALL_STATIC_LIBS WITH_SYSTEM_ZLIB WITH_SYSTEM_ZSTD
22
23	post-install:
24	${RLN} libchdr-static.a ${STAGEDIR}${PREFIX}/lib/libchdr.a
25
26	.include <bsd.port.mk>

Added Link Here

(-)b/devel/libchdr/files/patch-CMakeLists.txt (+26 lines)
1	--- CMakeLists.txt.orig 2024-11-12 19:29:11 UTC
2	+++ CMakeLists.txt
3	@@ -51,8 +51,12 @@ if (WITH_SYSTEM_ZSTD)
4
5	# zstd
6	if (WITH_SYSTEM_ZSTD)
7	- find_package(zstd REQUIRED)
8	- list(APPEND PLATFORM_LIBS zstd::libzstd_shared)
9	+ # find_package(zstd) fails on i386 because of a known problem with the
10	+ # provided cmake module. Use pkg_check_modules instead.
11	+ find_package(PkgConfig REQUIRED)
12	+ pkg_check_modules(zstd REQUIRED libzstd)
13	+ list(APPEND CHDR_INCLUDES ${zstd_INCLUDE_DIRS})
14	+ list(APPEND PLATFORM_LIBS ${zstd_LINK_LIBRARIES})
15	else()
16	option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
17	option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
18	@@ -83,7 +87,7 @@ if (INSTALL_STATIC_LIBS)
19	endif()
20
21	if (INSTALL_STATIC_LIBS)
22	- install(TARGETS chdr-static ${CHDR_LIBS}
23	+ install(TARGETS chdr-static
24	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
25	)
26	endif()

Added Link Here

(-)b/devel/libchdr/pkg-plist (-1 / +13 lines)
0	-	1	include/libchdr/bitstream.h
		2	include/libchdr/cdrom.h
		3	include/libchdr/chd.h
		4	include/libchdr/chdconfig.h
		5	include/libchdr/coretypes.h
		6	include/libchdr/flac.h
		7	include/libchdr/huffman.h
		8	lib/libchdr-static.a
		9	lib/libchdr.a
		10	lib/libchdr.so
		11	lib/libchdr.so.0
		12	lib/libchdr.so.0.2
		13	libdata/pkgconfig/libchdr.pc