<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1af73fa7b6de3eee44d5da842147d072d9b0790b">https://github.com/macports/macports-ports/commit/1af73fa7b6de3eee44d5da842147d072d9b0790b</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 1af73fa7b6d XviD: Add libxvidcore.dylib symlink; other cleanup
</span>1af73fa7b6d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1af73fa7b6de3eee44d5da842147d072d9b0790b
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Mon Apr 29 03:16:41 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> XviD: Add libxvidcore.dylib symlink; other cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Install libxvidcore.dylib symlink so that linking with -lxvidcore will
</span><span style='display:block; white-space:pre;color:#404040;'> link with the dynamic library not the static library.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use the two-level namespace instead of the flat namespace.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix a typo in configure script output: dynlib -> dylib
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69855
</span>---
multimedia/XviD/Portfile | 9 ++++++---
.../files/{patch-Makefile.diff => Makefile-verbose.patch} | 1 +
.../files/{patch-CFLAGS.diff => configure-CFLAGS.patch} | 3 ++-
multimedia/XviD/files/configure-SO_LINK.patch | 11 +++++++++++
multimedia/XviD/files/configure-dynlib.patch | 12 ++++++++++++
multimedia/XviD/files/configure-flat_namespace.patch | 13 +++++++++++++
6 files changed, 45 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XviD/Portfile b/multimedia/XviD/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c4f8403b7d9..d13125af897 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/XviD/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/XviD/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup muniversal 1.0
</span>
name XviD
version 1.3.7
<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 multimedia devel
platforms darwin sunos
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +34,11 @@ checksums rmd160 84d37c2b3b48fb6cde2b6a6a57c7e6c1bdf79556 \
</span>
worksrcdir xvidcore/build/generic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CFLAGS.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles configure-CFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure-dynlib.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure-flat_namespace.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure-SO_LINK.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Makefile-verbose.patch
</span>
use_autoreconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XviD/files/patch-Makefile.diff b/multimedia/XviD/files/Makefile-verbose.patch
</span>similarity index 99%
rename from multimedia/XviD/files/patch-Makefile.diff
rename to multimedia/XviD/files/Makefile-verbose.patch
<span style='display:block; white-space:pre;color:#808080;'>index 89085b4378f..beb7d399690 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/XviD/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/XviD/files/Makefile-verbose.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Let V=1 disable silent rules.
</span> --- Makefile.orig 2014-04-08 13:41:05.000000000 -0700
+++ Makefile 2014-06-13 07:44:45.000000000 -0700
@@ -45,6 +45,12 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XviD/files/patch-CFLAGS.diff b/multimedia/XviD/files/configure-CFLAGS.patch
</span>similarity index 87%
rename from multimedia/XviD/files/patch-CFLAGS.diff
rename to multimedia/XviD/files/configure-CFLAGS.patch
<span style='display:block; white-space:pre;color:#808080;'>index 10bdaba7018..c8cc8ba0589 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/XviD/files/patch-CFLAGS.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/XviD/files/configure-CFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Append default CFLAGS to the ones MacPorts sets; increases performance.
</span> --- configure.in.orig 2014-04-08 13:41:05.000000000 -0700
+++ configure.in 2014-06-13 07:49:59.000000000 -0700
@@ -119,7 +119,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +6,7 @@
</span> dnl
AC_MSG_CHECKING(whether to use default CFLAGS)
-if test x"$CFLAGS" = x"" ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test x"" = x"" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if true; then
</span> force_default_cc_options="yes"
AC_MSG_RESULT([yes])
else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XviD/files/configure-SO_LINK.patch b/multimedia/XviD/files/configure-SO_LINK.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..212e2e6fc9f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/XviD/files/configure-SO_LINK.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Install the libxvidcore.dylib symlink.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.in.orig 2019-12-28 08:19:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.in 2024-04-29 02:28:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,6 +329,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SO_LINK="libxvidcore.\$(SHARED_EXTENSION)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SPECIFIC_CFLAGS="-fPIC -fno-common -no-cpp-precomp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x"$macosx_module" = x"no"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([dylib options])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XviD/files/configure-dynlib.patch b/multimedia/XviD/files/configure-dynlib.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e9e2062a763
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/XviD/files/configure-dynlib.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix typo in configure output: dynlib -> dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.in.orig 2019-12-28 08:19:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.in 2024-04-29 02:28:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -266,7 +266,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([.so .a .o])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHARED_EXTENSION="so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([.dynlib .a .o])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([.dylib .a .o])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHARED_EXTENSION="dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STATIC_EXTENSION="a"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XviD/files/configure-flat_namespace.patch b/multimedia/XviD/files/configure-flat_namespace.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1d0545b7d36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/XviD/files/configure-flat_namespace.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not use the ancient flat namespace. Use the two-level namespace which has
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+been the default since Mac OS X 10.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.in.orig 2019-12-28 08:19:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.in 2024-04-29 02:28:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -333,7 +333,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x"$macosx_module" = x"no"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([dylib options])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SPECIFIC_LDFLAGS="-Wl,-read_only_relocs,suppress -dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SPECIFIC_LDFLAGS="-Wl,-read_only_relocs,suppress -dynamiclib -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([module options])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
</span></pre><pre style='margin:0'>
</pre>