From 66f8a8a0d2cac8b94a23711ef758d8d7371acb95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Tue, 27 Dec 2022 14:40:42 +0100 Subject: groups/231.native_packages_etc.group: file: bump to v5.44 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups/231.native_packages_etc.group | 7 +++++-- patches/file-5.42_pre.local.patch | 12 ------------ patches/file-5.44_pre.local.patch | 12 ++++++++++++ 3 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 patches/file-5.42_pre.local.patch create mode 100644 patches/file-5.44_pre.local.patch diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 3ff4f13f..e30c5b7c 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -149,9 +149,12 @@ zstd")"; : ${PKG_FFMPEG_URL:=https://ffmpeg.org/releases/ffmpeg-${PKG_FFMPEG_VERSION}.tar.xz}; : ${PKG_FFMPEG_CONFIGURE_ARGS:="--cc=${DEFAULT_TARGET}-gcc --cxx=${DEFAULT_TARGET}-g++ --disable-stripping --enable-cross-compile --enable-libass --enable-libshine --enable-libtheora --enable-libvorbis --enable-libxml2 --enable-gpl --enable-version3 --enable-gnutls --enable-libmp3lame --enable-libssh --pkg-config=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config --prefix=/ --target-os=midipix --x86asmexe=${DEFAULT_TARGET}-nasm"}; : ${PKG_FFMPEG_CFLAGS_BUILD_EXTRA:="-I${PREFIX_NATIVE}/include/SDL2 -I${PREFIX_NATIVE}/include/libxml2 -std=gnu99"}; -: ${PKG_FILE_SHA256SUM:=8c8015e91ae0e8d0321d94c78239892ef9dbc70c4ade0008c0e95894abfb1991}; -: ${PKG_FILE_VERSION:=5.43}; +: ${PKG_FILE_DEPENDS:="xz bzip2 libz"}; +: ${PKG_FILE_SHA256SUM:=3751c7fba8dbc831cb8d7cc8aff21035459b8ce5155ef8b0880a27d028475f3b}; +: ${PKG_FILE_VERSION:=5.44}; : ${PKG_FILE_URL:=http://ftp.astron.com/pub/file/file-${PKG_FILE_VERSION}.tar.gz}; +: ${PKG_FILE_CONFIGURE_ARGS_EXTRA:="--disable-zstdlib"}; +: ${PKG_FILE_CFLAGS_CONFIGURE_EXTRA:=-std=c99}; : ${PKG_GDBM_DEPENDS:="ncurses"}; : ${PKG_GDBM_SHA256SUM:=74b1081d21fff13ae4bd7c16e5d6e504a4c26f7cde1dca0d963a484174bbcacd}; : ${PKG_GDBM_VERSION:=1.23}; diff --git a/patches/file-5.42_pre.local.patch b/patches/file-5.42_pre.local.patch deleted file mode 100644 index c3cbd39d..00000000 --- a/patches/file-5.42_pre.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru file-5.42.orig/src/Makefile.in file-5.42/src/Makefile.in ---- file-5.42.orig/src/Makefile.in 2022-06-29 22:49:15.379469079 +0200 -+++ file-5.42/src/Makefile.in 2022-06-29 22:56:35.117265729 +0200 -@@ -199,7 +199,7 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(AM_LDFLAGS) -o $@ - AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; diff --git a/patches/file-5.44_pre.local.patch b/patches/file-5.44_pre.local.patch new file mode 100644 index 00000000..c3cbd39d --- /dev/null +++ b/patches/file-5.44_pre.local.patch @@ -0,0 +1,12 @@ +diff -ru file-5.42.orig/src/Makefile.in file-5.42/src/Makefile.in +--- file-5.42.orig/src/Makefile.in 2022-06-29 22:49:15.379469079 +0200 ++++ file-5.42/src/Makefile.in 2022-06-29 22:56:35.117265729 +0200 +@@ -199,7 +199,7 @@ + CCLD = $(CC) + LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(AM_LDFLAGS) -o $@ + AM_V_CCLD = $(am__v_CCLD_@AM_V@) + am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) + am__v_CCLD_0 = @echo " CCLD " $@; -- cgit v1.2.3