Skip to content

Commit 9192ce5

Browse files
committed
depends: pull upstream libdmg-hfsplus changes
1 parent 9b54f34 commit 9192ce5

File tree

2 files changed

+52
-5
lines changed

2 files changed

+52
-5
lines changed

depends/packages/native_libdmg-hfsplus.mk

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package=native_libdmg-hfsplus
2-
$(package)_version=0.1
3-
$(package)_download_path=https://github.com/theuni/libdmg-hfsplus/archive
4-
$(package)_file_name=libdmg-hfsplus-v$($(package)_version).tar.gz
5-
$(package)_sha256_hash=6569a02eb31c2827080d7d59001869ea14484c281efab0ae7f2b86af5c3120b3
2+
$(package)_version=7ac55ec64c96f7800d9818ce64c79670e7f02b67
3+
$(package)_download_path=https://github.com/planetbeing/libdmg-hfsplus/archive
4+
$(package)_file_name=$($(package)_version).tar.gz
5+
$(package)_sha256_hash=56fbdc48ec110966342f0ecddd6f8f89202f4143ed2a3336e42bbf88f940850c
66
$(package)_build_subdir=build
7+
$(package)_patches=remove-libcrypto-dependency.patch
78

89
define $(package)_preprocess_cmds
10+
patch -p1 < $($(package)_patch_dir)/remove-libcrypto-dependency.patch && \
911
mkdir build
1012
endef
1113

1214
define $(package)_config_cmds
13-
cmake -DCMAKE_INSTALL_PREFIX:PATH=$(build_prefix)/bin ..
15+
cmake -DCMAKE_INSTALL_PREFIX:PATH=$(build_prefix) ..
1416
endef
1517

1618
define $(package)_build_cmds
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
From 3e5fd3fb56bc9ff03beb535979e33dcf83fe1f70 Mon Sep 17 00:00:00 2001
2+
From: Cory Fields <[email protected]>
3+
Date: Thu, 8 May 2014 12:39:42 -0400
4+
Subject: [PATCH] dmg: remove libcrypto dependency
5+
6+
---
7+
dmg/CMakeLists.txt | 16 ----------------
8+
1 file changed, 16 deletions(-)
9+
10+
diff --git a/dmg/CMakeLists.txt b/dmg/CMakeLists.txt
11+
index eec62d6..3969f64 100644
12+
--- a/dmg/CMakeLists.txt
13+
+++ b/dmg/CMakeLists.txt
14+
@@ -1,12 +1,5 @@
15+
-INCLUDE(FindOpenSSL)
16+
INCLUDE(FindZLIB)
17+
18+
-FIND_LIBRARY(CRYPTO_LIBRARIES crypto
19+
- PATHS
20+
- /usr/lib
21+
- /usr/local/lib
22+
- )
23+
-
24+
IF(NOT ZLIB_FOUND)
25+
message(FATAL_ERROR "zlib is required for dmg!")
26+
ENDIF(NOT ZLIB_FOUND)
27+
@@ -18,15 +11,6 @@ link_directories(${PROJECT_BINARY_DIR}/common ${PROJECT_BINARY_DIR}/hfs)
28+
29+
add_library(dmg adc.c base64.c checksum.c dmgfile.c dmglib.c filevault.c io.c partition.c resources.c udif.c)
30+
31+
-IF(OPENSSL_FOUND)
32+
- add_definitions(-DHAVE_CRYPT)
33+
- include_directories(${OPENSSL_INCLUDE_DIR})
34+
- target_link_libraries(dmg ${CRYPTO_LIBRARIES})
35+
- IF(WIN32)
36+
- TARGET_LINK_LIBRARIES(dmg gdi32)
37+
- ENDIF(WIN32)
38+
-ENDIF(OPENSSL_FOUND)
39+
-
40+
target_link_libraries(dmg common hfs z)
41+
42+
add_executable(dmg-bin dmg.c)
43+
--
44+
2.22.0
45+

0 commit comments

Comments
 (0)