diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/cross.patch | 11 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 1 |
5 files changed, 23 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index bfd0d6c..7b9f118 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ PKG_CHECK_MODULES(GMERLIN, gmerlin >= $GMERLIN_REQUIRED, , AC_MSG_ERROR("gmerlin gmerlin_plugindir='$(libdir)/gmerlin/plugins' dnl LDFLAGS for plugins -GMERLIN_PLUGIN_LDFLAGS="-export-symbols "`pkg-config --variable=prefix gmerlin`"/share/gmerlin/plugin.sym $SAVE_LDFLAGS" +GMERLIN_PLUGIN_LDFLAGS="-export-symbols "`$PKG_CONFIG --variable=prefix gmerlin`"/share/gmerlin/plugin.sym $SAVE_LDFLAGS" AC_SUBST(GMERLIN_PLUGIN_LDFLAGS) AC_SUBST(gmerlin_plugindir) diff --git a/debian/changelog b/debian/changelog index 087c716..2114a8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gmerlin-encoders (2.0.0~svn6278-4) unstable; urgency=medium + + [ Helmut Grohne <helmut@subdivi.de> ] + * Fix FTCBFS: (Closes: #1024298) + + cross.patch: Use the host architecture pkg-config. + + Explicitly disable faac. + + -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org> Mon, 30 Jan 2023 16:55:31 +0100 + gmerlin-encoders (2.0.0~svn6278-3) unstable; urgency=medium * More FFmpeg5 fixes diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch new file mode 100644 index 0000000..de57c48 --- /dev/null +++ b/debian/patches/cross.patch @@ -0,0 +1,11 @@ +--- gmerlin-encoders-2.0.0~svn6278.orig/configure.ac ++++ gmerlin-encoders-2.0.0~svn6278/configure.ac +@@ -28,7 +28,7 @@ + gmerlin_plugindir='$(libdir)/gmerlin/plugins' + + dnl LDFLAGS for plugins +-GMERLIN_PLUGIN_LDFLAGS="-export-symbols "`pkg-config --variable=prefix gmerlin`"/share/gmerlin/plugin.sym $SAVE_LDFLAGS" ++GMERLIN_PLUGIN_LDFLAGS="-export-symbols "`$PKG_CONFIG --variable=prefix gmerlin`"/share/gmerlin/plugin.sym $SAVE_LDFLAGS" + + AC_SUBST(GMERLIN_PLUGIN_LDFLAGS) + AC_SUBST(gmerlin_plugindir) diff --git a/debian/patches/series b/debian/patches/series index 8c49ce6..a9779eb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ plugins-ldflags.patch fix-spelling.patch logging.patch set_enum.patch +cross.patch diff --git a/debian/rules b/debian/rules index 5278e05..0e0a6b5 100755 --- a/debian/rules +++ b/debian/rules @@ -29,6 +29,7 @@ override_dh_auto_configure: --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --enable-static=no \ --with-cpuflags=none \ + --disable-faac \ $(DEB_CONFIGURE_EXTRA_FLAGS) # Suppress scanning documentation images causing false alarms. |