Fixup

microsoft · Sep 28, 2024 · bb94103 · bb94103
1 parent 52afd89
commit bb94103
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 2 deletions.
diff --git a/ports/libdvdnav/no-undefined.diff b/ports/libdvdnav/no-undefined.diff
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 595378b..516f26e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,6 +118,7 @@ dnl
+ dnl This should be after all checks
+ dnl ---------------------------------------------
+ AS_CASE([$host_os],
++  [*mingw32*], LDFLAGS="-no-undefined $LDFLAGS",
+   [os2*], [LDFLAGS="$LDFLAGS -no-undefined"])
+
+ dnl ---------------------------------------------
diff --git a/ports/libdvdnav/portfile.cmake b/ports/libdvdnav/portfile.cmake
@@ -5,6 +5,8 @@ vcpkg_from_gitlab(
     REF ${VERSION}
     SHA512 080814c30f193176393bf6d4496a1e815b3b288cd102201ba177a13a46f733e1e0b5e05d6ca169e902c669d6f3567926c97e5a20a6712ed5620dcb10c3c3a022
     HEAD_REF master
+    PATCHES
+        no-undefined.diff
 )
 
 vcpkg_find_acquire_program(PKGCONFIG)
@@ -15,6 +17,10 @@ set(cppflags "")
 if(VCPKG_TARGET_IS_WINDOWS)
     # PATH_MAX from msvc/libdvdcss.vcxproj
     set(cppflags "CPPFLAGS=\$CPPFLAGS -DPATH_MAX=2048 -DWIN32_LEAN_AND_MEAN")
+    if(NOT VCPKG_TARGET_IS_MINGW)
+        cmake_path(RELATIVE_PATH SOURCE_PATH BASE_DIRECTORY "${CURRENT_BUILDTREES_DIR}" OUTPUT_VARIABLE sources)
+        string(APPEND cppflags " -I../${sources}/msvc/include -D_CRT_SECURE_NO_WARNINGS")
+    endif()
 endif()
 
 vcpkg_configure_make(

diff --git a/ports/libdvdread/no-undefined.diff b/ports/libdvdread/no-undefined.diff
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index a60ef0c..eeb6715 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,6 +63,7 @@ AS_CASE([$host],
+   [*mingw32* | *cygwin*], [AC_CHECK_FUNCS(gettimeofday)])
+
+ AS_CASE([$host],
++  [*mingw32*], LDFLAGS="-no-undefined $LDFLAGS",
+   [*-os2-*], LDFLAGS="-no-undefined -Zbin-files $LDFLAGS")
+
+ AS_CASE([$host],
diff --git a/ports/libdvdread/portfile.cmake b/ports/libdvdread/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_gitlab(
     HEAD_REF master
     PATCHES
         msvc.diff
+        no-undefined.diff
 )
 file(TOUCH "${SOURCE_PATH}/msvc/include/strings.h")
 file(WRITE "${SOURCE_PATH}/ChangeLog" "Cf. https://code.videolan.org/videolan/libdvdread/-/commits/${VERSION}/") # not in git

diff --git a/versions/l-/libdvdnav.json b/versions/l-/libdvdnav.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "69394f207d17594df4e98ff13ef87df7c15daf0e",
+      "git-tree": "2f577ec09617aa68f5e04c49ad0ae613fedf92ff",
       "version-semver": "6.1.1",
       "port-version": 0
     }

diff --git a/versions/l-/libdvdread.json b/versions/l-/libdvdread.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "e8d6657807fd4a0e5a252fc963ae8787b7483b0e",
+      "git-tree": "cd1fe1599576f2c58de557031f266a9986a3e97c",
       "version-semver": "6.1.3",
       "port-version": 0
     }