ffms2: rebase patch

m-ab-s · Apr 28, 2023 · 9b38a14 · 9b38a14
1 parent f7ac4c7
commit 9b38a14
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/ffms2/0001-ffmsindex-fix-linking-issues.patch b/ffms2/0001-ffmsindex-fix-linking-issues.patch
@@ -12,10 +12,10 @@ diff --git a/Makefile.am b/Makefile.am
 index db4577e..ea0f615 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -49,6 +49,7 @@ include_HEADERS = $(top_srcdir)/include/ffms.h $(top_srcdir)/include/ffmscompat.
+@@ -56,6 +56,7 @@ include_HEADERS = $(top_srcdir)/include/ffms.h $(top_srcdir)/include/ffmscompat.
  bin_PROGRAMS = src/index/ffmsindex
  src_index_ffmsindex_SOURCES = src/index/ffmsindex.cpp
- src_index_ffmsindex_LDADD = src/core/libffms2.la
+ src_index_ffmsindex_LDADD = -lavutil src/core/libffms2.la
 +src_index_ffmsindex_LDFLAGS = @src_index_ffmsindex_LDFLAGS@
 
  .PHONY: test test-build test-clean test-sync test-run
@@ -24,7 +24,7 @@ diff --git a/configure.ac b/configure.ac
 index f06c008..617cfea 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -140,12 +140,13 @@ AC_MSG_RESULT($bsymbolic)
+@@ -150,8 +150,10 @@ AC_MSG_RESULT($bsymbolic)
 
  if echo "$host" | $GREP "mingw" >/dev/null 2>&1; then
      LTUNDEF="-no-undefined"
@@ -35,10 +35,6 @@ index f06c008..617cfea 100644
 
  AC_CONFIG_FILES([
  Makefile
- ffms2.pc
- ])
- AC_OUTPUT
--
 -- 
 2.20.1