From 24d1295df33643208b3a077fbf9274bdc9eca214 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sun, 29 Mar 2020 16:09:48 +0200 Subject: [PATCH] Contribs: update fribidi to 1.0.9 Move to meson, github, tar.xz, support msvc and bionic by default... --- contrib/src/fribidi/SHA512SUMS | 2 +- contrib/src/fribidi/fribidi.patch | 88 --------------------------------------- contrib/src/fribidi/msvc.patch | 18 -------- contrib/src/fribidi/no-ansi.patch | 12 ------ contrib/src/fribidi/rules.mak | 53 +++++++++++------------ 5 files changed, 25 insertions(+), 148 deletions(-) delete mode 100644 contrib/src/fribidi/fribidi.patch delete mode 100644 contrib/src/fribidi/msvc.patch delete mode 100644 contrib/src/fribidi/no-ansi.patch rewrite contrib/src/fribidi/rules.mak (70%) diff --git a/contrib/src/fribidi/SHA512SUMS b/contrib/src/fribidi/SHA512SUMS index aa2614a6fc..77bf0692bb 100644 --- a/contrib/src/fribidi/SHA512SUMS +++ b/contrib/src/fribidi/SHA512SUMS @@ -1 +1 @@ -4bfdda43d961030a8a2ae2c98d2ca5d43c1b59633fa0987920c5537ec69f3f624204ceacc4c474d878cbb417ee2d9e708dfe169cfce6ad584d2f2d5122678b63 fribidi-0.19.7.tar.bz2 +e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed fribidi-1.0.9.tar.xz diff --git a/contrib/src/fribidi/fribidi.patch b/contrib/src/fribidi/fribidi.patch deleted file mode 100644 index 9ccc94b399..0000000000 --- a/contrib/src/fribidi/fribidi.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -u fribidi.orig/Makefile.am fribidi/Makefile.am ---- fribidi.orig/Makefile.am 2005-08-25 20:35:34.000000000 +0200 -+++ fribidi/Makefile.am 2008-01-28 14:31:19.000000000 +0100 -@@ -9,7 +9,7 @@ - ############################################################################## - - ## The order of subdirs is important, don't change without a reason. --SUBDIRS = gen.tab charset lib bin doc test -+SUBDIRS = gen.tab charset lib #bin doc test - - EXTRA_DIST = bootstrap ChangeLog.old - -diff -u fribidi.orig/configure.ac fribidi/configure.ac ---- fribidi.orig/configure.ac 2008-01-16 00:15:46.000000000 +0100 -+++ fribidi/configure.ac 2008-01-28 14:32:38.000000000 +0100 -@@ -165,38 +165,38 @@ - AM_CONDITIONAL(FRIBIDI_CHARSETS, test x$FRIBIDI_CHARSETS = x1) - - # --with[out]-glib --AC_ARG_WITH(glib, -- AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@], -- [use Glib @<:@default=auto@:>@])) --GLIB_PACKAGE=glib-2.0 --GLIB_MINVERSION=2.4 -+#AC_ARG_WITH(glib, -+# AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@], -+# [use Glib @<:@default=auto@:>@])) -+#GLIB_PACKAGE=glib-2.0 -+#GLIB_MINVERSION=2.4 - GLIB_LIBS= - GLIB_CFLAGS= --if test x$with_glib = xyes; then -- PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION) -- FRIBIDI_USE_GLIB=1 --else --if test x$with_glib = xno; then -+#if test x$with_glib = xyes; then -+# PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION) -+# FRIBIDI_USE_GLIB=1 -+#else -+#if test x$with_glib = xno; then - FRIBIDI_USE_GLIB=0 --else -- PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION, -- FRIBIDI_USE_GLIB=1, -- FRIBIDI_USE_GLIB=0) --fi --fi --if test x$FRIBIDI_USE_GLIB = x0; then -+#else -+# PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION, -+# FRIBIDI_USE_GLIB=1, -+# FRIBIDI_USE_GLIB=0) -+#fi -+#fi -+#if test x$FRIBIDI_USE_GLIB = x0; then - GLIB_PACKAGE= --fi -+#fi - AC_SUBST(FRIBIDI_USE_GLIB) - AM_CONDITIONAL(FRIBIDI_USE_GLIB, test x$FRIBIDI_USE_GLIB = x1) - - --MISC_CFLAGS="$GLIB_CFLAGS" --MISC_LIBS="$GLIB_LIBS" --MISC_PACKAGES="$GLIB_PACKAGE" --AC_SUBST(MISC_CFLAGS) --AC_SUBST(MISC_LIBS) --AC_SUBST(MISC_PACKAGES) -+#MISC_CFLAGS="$GLIB_CFLAGS" -+#MISC_LIBS="$GLIB_LIBS" -+#MISC_PACKAGES="$GLIB_PACKAGE" -+#AC_SUBST(MISC_CFLAGS) -+#AC_SUBST(MISC_LIBS) -+#AC_SUBST(MISC_PACKAGES) - - # Generate output - AC_CONFIG_FILES([fribidi.pc ---- fribidi.orig/fribidi.pc.in 2008-02-02 23:06:05.000000000 +0000 -+++ fribidi/fribidi.pc.in 2008-02-02 23:06:39.000000000 +0000 -@@ -7,7 +7,6 @@ - - Name: @PACKAGE_NAME@ - Description: Unicode Bidirectional Algorithm Library --Requires: @MISC_PACKAGES@ - Version: @VERSION@ - Libs: -L${libdir} -lfribidi - Cflags: -I${includedir}/@PACKAGE@ diff --git a/contrib/src/fribidi/msvc.patch b/contrib/src/fribidi/msvc.patch deleted file mode 100644 index 052bc1e5b7..0000000000 --- a/contrib/src/fribidi/msvc.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- fribidi/charset/fribidi-char-sets.c 2012-12-02 17:25:40.000000000 +0100 -+++ /home/vlc/vlc/contrib/windowsphone/fribidi/charset/fribidi-char-sets.c 2014-12-15 16:54:39.537785800 +0100 -@@ -117,6 +117,7 @@ - # include - # define fribidi_strcasecmp g_ascii_strcasecmp - #else /* !FRIBIDI_USE_GLIB */ -+#if !defined(_MSC_VER) - static char - toupper ( - /* input */ -@@ -125,6 +126,7 @@ - { - return c < 'a' || c > 'z' ? c : c + 'A' - 'a'; - } -+#endif - - static int - fribidi_strcasecmp ( diff --git a/contrib/src/fribidi/no-ansi.patch b/contrib/src/fribidi/no-ansi.patch deleted file mode 100644 index 9f241fea80..0000000000 --- a/contrib/src/fribidi/no-ansi.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur fribidi.orig/configure.ac fribidi/configure.ac ---- fribidi.orig/configure.ac 2012-05-29 16:13:47.340167837 -0400 -+++ fribidi/configure.ac 2012-05-29 16:14:23.180167432 -0400 -@@ -110,7 +110,7 @@ - # Checks for compiler characteristics. - changequote(,)dnl - if test "x$GCC" = "xyes"; then -- CFLAGS="$CFLAGS -Wall -ansi " -+ CFLAGS="$CFLAGS -Wall" - fi - changequote([,])dnl - diff --git a/contrib/src/fribidi/rules.mak b/contrib/src/fribidi/rules.mak dissimilarity index 70% index 555251c6a4..4757e95d23 100644 --- a/contrib/src/fribidi/rules.mak +++ b/contrib/src/fribidi/rules.mak @@ -1,29 +1,24 @@ -# FRIBIDI -FRIBIDI_VERSION := 0.19.7 -FRIBIDI_URL := http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.bz2 - -PKGS += fribidi -ifeq ($(call need_pkg,"fribidi"),) -PKGS_FOUND += fribidi -endif - -$(TARBALLS)/fribidi-$(FRIBIDI_VERSION).tar.bz2: - $(call download_pkg,$(FRIBIDI_URL),fribidi) - -.sum-fribidi: fribidi-$(FRIBIDI_VERSION).tar.bz2 - -fribidi: fribidi-$(FRIBIDI_VERSION).tar.bz2 .sum-fribidi - $(UNPACK) - $(APPLY) $(SRC)/fribidi/fribidi.patch - $(APPLY) $(SRC)/fribidi/no-ansi.patch -ifdef HAVE_VISUALSTUDIO - $(APPLY) $(SRC)/fribidi/msvc.patch -endif - $(MOVE) - -# FIXME: DEPS_fribidi = iconv $(DEPS_iconv) -.fribidi: fribidi - $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) - cd $< && $(MAKE) install - touch $@ +# FRIBIDI +FRIBIDI_VERSION := 1.0.9 +FRIBIDI_URL := https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION)/fribidi-$(FRIBIDI_VERSION).tar.xz + +PKGS += fribidi +ifeq ($(call need_pkg,"fribidi"),) +PKGS_FOUND += fribidi +endif + +$(TARBALLS)/fribidi-$(FRIBIDI_VERSION).tar.xz: + $(call download_pkg,$(FRIBIDI_URL),fribidi) + +.sum-fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz + +fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz .sum-fribidi + $(UNPACK) + $(MOVE) + +# FIXME: DEPS_fribidi = iconv $(DEPS_iconv) +.fribidi: fribidi crossfile.meson + cd $< && rm -rf ./build + cd $< && $(HOSTVARS_MESON) $(MESON) -Ddocs=false build + cd $< && cd build && ninja install + touch $@ -- 2.11.4.GIT