Mercurial > mxe-octave

changeset 6484:5facfed811ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
faad: update to v2.10.1 * src/faad2.mk: update version, checksum, source paths, disable docs * dist-files.mk: remove ref to patch file * src/faad2-1-fixes.patch: removed
author John Donoghue <john.donoghue@ieee.org>
date Fri, 28 Oct 2022 15:10:37 -0400
parents 0e97f4f427b9
children eca0bd99fec4
files dist-files.mk src/faad2-1-fixes.patch src/faad2.mk
diffstat 3 files changed, 8 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Fri Oct 28 15:10:36 2022 -0400
+++ b/dist-files.mk	Fri Oct 28 15:10:37 2022 -0400
@@ -88,7 +88,6 @@
   epstool.mk \
   exiv2.mk \
   expat.mk \
-  faad2-1-fixes.patch \
   faad2.mk \
   ffmpeg-1-fixes.patch \
   ffmpeg.mk \
--- a/src/faad2-1-fixes.patch	Fri Oct 28 15:10:36 2022 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -ruN faad2-2.8.8.orig/libfaad/decoder.c faad2-2.8.8/libfaad/decoder.c
---- faad2-2.8.8.orig/libfaad/decoder.c	2017-12-17 17:17:36.000000000 +0100
-+++ faad2-2.8.8/libfaad/decoder.c	2018-07-14 04:46:07.058232749 +0200
-@@ -54,7 +54,7 @@
- #endif
- 
- #if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
--#include "win32_ver.h"
-+//#include "win32_ver.h"
- #endif
- 
- /* static function declarations */
--- a/src/faad2.mk	Fri Oct 28 15:10:36 2022 -0400
+++ b/src/faad2.mk	Fri Oct 28 15:10:37 2022 -0400
@@ -3,25 +3,26 @@
 
 PKG             := faad2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.8.8
-$(PKG)_CHECKSUM := 0d49c516d4a83c39053a9bd214fddba72cbc34ad
+$(PKG)_VERSION  := 2.10.1
+$(PKG)_CHECKSUM := 47b9d0ad96e1b402d7ee9d72346b9670b2a81085
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/faac/$(PKG)-src/$(PKG)-2.8.0/$($(PKG)_FILE)
+$(PKG)_URL      := https://github.com/knik0/$(PKG)/archive/refs/tags/$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://sourceforge.net/projects/faac/files/faad2-src/faad2-2.8.0/' | \
-    $(SED) -n 's,.*title=\"faad2-\([0-9\.]*\)\.tar\.gz\".*,\1,p' | $(SORT) -V | \
+    $(WGET) -q -O- 'https://github.com/knik0/faad2/tags' | \
+    $(SED) -n 's|.*releases/tag/\([^"]*\).*|\1|p' | $(SED) 's|_|.|g' | $(SORT) -V | \
     tail -1
 endef
 
 define $(PKG)_BUILD
+    cd '$(1)' && '$(1)/bootstrap'
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
-    $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS='-no-undefined'
-    $(MAKE) -C '$(1)' -j 1 install LDFLAGS='-no-undefined'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS='-no-undefined' DESTDIR='$(3)'
+    $(MAKE) -C '$(1)' -j 1 install LDFLAGS='-no-undefined' $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS) DESTDIR='$(3)'
 endef