<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7b4f9aa2676882942ebdda0b490963e8ca3af5a7">https://github.com/macports/macports-ports/commit/7b4f9aa2676882942ebdda0b490963e8ca3af5a7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7b4f9aa2676 faad2: update cmake patch
</span>7b4f9aa2676 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7b4f9aa2676882942ebdda0b490963e8ca3af5a7
</span>Author: aeiouaeiouaeiouaeiouaeiouaeiou <aeioudev@outlook.com>
AuthorDate: Thu Nov 9 20:40:28 2023 +0300
<span style='display:block; white-space:pre;color:#404040;'> faad2: update cmake patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68663
</span>---
audio/faad2/Portfile | 4 +-
.../faad2/files/patch-build-shared-libraries.diff | 26 --------
audio/faad2/files/patch-fix-cmake.diff | 78 ++++++++++++++++++++++
3 files changed, 80 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/faad2/Portfile b/audio/faad2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 62668d20773..5f1683e914c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/faad2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/faad2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup cmake 1.1
</span>
github.setup knik0 faad2 2.11.0
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories audio
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,4 +22,4 @@ checksums rmd160 1a7b27c0e152cc6c7d1cde184744338ae4d4e19d \
</span> sha256 720c1dc404439e0a9117aa144dc7ead56f1658adf4badbb39f959d6ad8eed489 \
size 656610
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-build-shared-libraries.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/faad2/files/patch-build-shared-libraries.diff b/audio/faad2/files/patch-build-shared-libraries.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cbeeb650f0d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/faad2/files/patch-build-shared-libraries.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 92ce281311f629faa99c9e06baaf41977f431f1b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Fabian Greffrath <fabian@greffrath.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 7 Nov 2023 11:19:42 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] build shared libraries by default and hide symbols
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,12 +15,18 @@ if(NOT DEFINED FAAD_BUNDLED_MODE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # depending on whether or not we are the top-level project.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(FAAD_PARENT_DIRECTORY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FAAD_BUNDLED_MODE ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(BUILD_SHARED_LIBS OFF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FAAD_BUNDLED_MODE OFF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(BUILD_SHARED_LIBS ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mark_as_advanced(FAAD_BUNDLED_MODE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_C_VISIBILITY_PRESET hidden)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(MATH_LIBRARY m)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(GNUInstallDirs)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/faad2/files/patch-fix-cmake.diff b/audio/faad2/files/patch-fix-cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..54d313a5b4e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/faad2/files/patch-fix-cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/knik0/faad2/compare/2.11.0...a5d3097f9c788d3d895dbbb622b67afcd77c9faf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,8 +3,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # - Solaris 11.4 SRU 15 : 3.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_minimum_required(VERSION 3.15)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include(CheckSymbolExists)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project(LIBFAAD2 LANGUAGES C)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Set a default build type if none was specified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(default_build_type "RelWithDebInfo")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STRING "Choose the type of build." FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Set the possible values of build type for cmake-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If FAAD is being bundled in another project, we don't want to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # install anything. However, we want to let people override this, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we'll use the FAAD_BUNDLED_MODE variable to let them do that; just
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,12 +28,27 @@ if(NOT DEFINED FAAD_BUNDLED_MODE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # depending on whether or not we are the top-level project.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(FAAD_PARENT_DIRECTORY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(FAAD_BUNDLED_MODE ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT DEFINED BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(BUILD_SHARED_LIBS OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(FAAD_BUNDLED_MODE OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT DEFINED BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(BUILD_SHARED_LIBS ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mark_as_advanced(FAAD_BUNDLED_MODE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT DEFINED CMAKE_C_VISIBILITY_PRESET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_C_VISIBILITY_PRESET hidden)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (WIN32 AND NOT DEFINED CMAKE_DLL_NAME_WITH_SOVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_DLL_NAME_WITH_SOVERSION ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(MATH_LIBRARY m)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(GNUInstallDirs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,6 +106,13 @@ set(FAAD_DEFINES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PACKAGE_VERSION=\"${FAAD_VERSION}\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++check_symbol_exists(lrintf "math.h" HAVE_LRINTF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(HAVE_LRINTF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND FAAD_DEFINES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ HAVE_LRINTF=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(FAAD_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -237,4 +272,10 @@ if(NOT FAAD_BUNDLED_MODE AND NOT MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILES ${CMAKE_CURRENT_BINARY_DIR}/include/neaacdec.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILES frontend/faad.man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RENAME faad.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif() # FAAD_BUNDLED_MODE
</span></pre><pre style='margin:0'>
</pre>