Mercurial > mxe-octave
changeset 6429:b8de860872cd
update to v1.4.1
* src/flac-1-cross.patch: new file
* dist-files.mk:add link to new file, removed old
* src/flac.mk: update version, checksum
* src/flac-1-ucrt.patch: removed file
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Mon, 26 Sep 2022 13:12:49 -0400 |
| parents | 11a3af7e5c3e |
| children | 8c787c429502 |
| files | dist-files.mk src/flac-1-cross.patch src/flac-1-ucrt.patch src/flac.mk |
| diffstat | 4 files changed, 36 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Mon Sep 26 13:12:48 2022 -0400 +++ b/dist-files.mk Mon Sep 26 13:12:49 2022 -0400 @@ -96,7 +96,7 @@ file-test.c \ file.mk \ fixesproto.mk \ - flac-1-ucrt.patch \ + flac-1-cross.patch \ flac.mk \ fltk-2-uuid-mod.patch \ fltk-test.cpp \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/flac-1-cross.patch Mon Sep 26 13:12:49 2022 -0400 @@ -0,0 +1,33 @@ +diff -ur flac-1.4.1.orig/configure.ac flac-1.4.1/configure.ac +--- flac-1.4.1.orig/configure.ac 2022-09-24 11:02:18.098776155 -0400 ++++ flac-1.4.1/configure.ac 2022-09-24 11:06:34.016159903 -0400 +@@ -376,8 +376,12 @@ + AM_CONDITIONAL(FLaC__HAS_DOXYGEN, test -n "$DOXYGEN") + + if test "x$DOXYGEN" = "x"; then +- AC_CHECK_FILE($srcdir/doc/FLAC.tag,[HAVE_PREBUILT_FLAC_TAG=yes]) +- AC_CHECK_FILE($srcdir/doc/api/modules.html,[HAVE_PREBUILT_API_DIR=yes]) ++ if test -f "$srcdir/doc/FLAC.tag"; then ++ HAVE_PREBUILT_FLAC_TAG=yes ++ fi ++ if test -f "$srcdir/doc/api/modules.html"; then ++ HAVE_PREBUILT_API_DIR=yes ++ fi + fi + AM_CONDITIONAL(FLaC__HAS_PREBUILT_DOXYGEN, test "x$HAVE_PREBUILD_FLAG_TAG$HAVEPREBUILD_API_DIR" = "xyesyes") + +@@ -483,8 +487,12 @@ + AC_DEFINE(FLAC__HAS_PANDOC) + AH_TEMPLATE(FLAC__HAS_PANDOC, [define if you have pandoc]) + else +-AC_CHECK_FILE($srcdir/man/flac.1,[HAVE_MAN_FLAC=yes]) +-AC_CHECK_FILE($srcdir/man/metaflac.1,[HAVE_MAN_METAFLAC=yes]) ++ if test -f "$srcdir/man/flac.1"; then ++ HAVE_MAN_FLAC=yes ++ fi ++ if test -f "$srcdir/man/metaflac.1"; then ++ HAVE_MAN_METAFLAC=yes ++ fi + fi + AM_CONDITIONAL(FLaC__HAS_PREBUILT_MANPAGES, test "x$HAVE_MAN_FLAC$HAVE_MAN_METAFLAC" = "xyesyes") +
--- a/src/flac-1-ucrt.patch Mon Sep 26 13:12:48 2022 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -Don't force MSVCRT version on mingw. - -diff -aur a/configure.ac b/configure.ac ---- a/configure.ac 2019-08-04 10:26:40.680643000 +0200 -+++ b/configure.ac 2021-11-17 18:56:11.962266940 +0100 -@@ -208,7 +208,6 @@ - os_is_windows=no - case "$host" in - *mingw*) -- CPPFLAGS="-D__MSVCRT_VERSION__=0x0601 $CPPFLAGS" - os_is_windows=yes - ;; - esac
--- a/src/flac.mk Mon Sep 26 13:12:48 2022 -0400 +++ b/src/flac.mk Mon Sep 26 13:12:49 2022 -0400 @@ -3,8 +3,8 @@ PKG := flac $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.0 -$(PKG)_CHECKSUM := df471fc1f33f8b00f2330c22ecbfe485f2b9715b +$(PKG)_VERSION := 1.4.1 +$(PKG)_CHECKSUM := 6fb0458bd013eca372fb7912675be736e866f4dd $(PKG)_SUBDIR := flac-$($(PKG)_VERSION) $(PKG)_FILE := flac-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://downloads.xiph.org/releases/flac/$($(PKG)_FILE)