[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: fontconfig: remove unused patch
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon Oct 24 13:14:39 UTC 2022
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
5e8b6078 by Steve Lhomme at 2022-10-24T12:25:50+00:00
contrib: fontconfig: remove unused patch
- - - - -
a37f1d13 by Steve Lhomme at 2022-10-24T12:25:50+00:00
contrib: fontconfig: remove unneeded Win32 patches
Win32 builds fine without those patches. And we don't don't build for win32
anymore.
- - - - -
c7bbf86e by Steve Lhomme at 2022-10-24T12:25:50+00:00
contrib: goom: pass the m4 directory to the reconf call
Rather than patching it.
- - - - -
6 changed files:
- − contrib/src/fontconfig/fontconfig-march.patch
- − contrib/src/fontconfig/fontconfig-noxml2.patch
- − contrib/src/fontconfig/fontconfig-win32.patch
- contrib/src/fontconfig/rules.mak
- contrib/src/goom/goom2k4-autotools.patch
- contrib/src/goom/rules.mak
Changes:
=====================================
contrib/src/fontconfig/fontconfig-march.patch deleted
=====================================
@@ -1,48 +0,0 @@
-diff -urNp fontconfig.orig/fc-arch/Makefile.am fontconfig/fc-arch/Makefile.am
---- fontconfig.orig/fc-arch/Makefile.am 2009-03-18 22:02:20.000000000 +0100
-+++ fontconfig/fc-arch/Makefile.am 2010-01-11 17:58:51.000000000 +0100
-@@ -22,6 +22,8 @@
- # PERFORMANCE OF THIS SOFTWARE.
- #
-
-+CPPFLAGS =
-+CFLAGS =
- CC = @CC_FOR_BUILD@
- EXEEXT = @EXEEXT_FOR_BUILD@
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-diff -urNp fontconfig.orig/fc-case/Makefile.am fontconfig/fc-case/Makefile.am
---- fontconfig.orig/fc-case/Makefile.am 2009-03-18 22:02:20.000000000 +0100
-+++ fontconfig/fc-case/Makefile.am 2010-01-11 17:56:39.000000000 +0100
-@@ -22,6 +22,8 @@
- # PERFORMANCE OF THIS SOFTWARE.
- #
-
-+CPPFLAGS =
-+CFLAGS =
- CC = @CC_FOR_BUILD@
- EXEEXT = @EXEEXT_FOR_BUILD@
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-diff -urNp fontconfig.orig/fc-glyphname/Makefile.am fontconfig/fc-glyphname/Makefile.am
---- fontconfig.orig/fc-glyphname/Makefile.am 2009-03-18 22:02:20.000000000 +0100
-+++ fontconfig/fc-glyphname/Makefile.am 2010-01-11 17:57:29.000000000 +0100
-@@ -22,6 +22,8 @@
- # PERFORMANCE OF THIS SOFTWARE.
- #
-
-+CPPFLAGS =
-+CFLAGS =
- CC = @CC_FOR_BUILD@
- EXEEXT = @EXEEXT_FOR_BUILD@
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-diff -urNp fontconfig.orig/fc-lang/Makefile.am fontconfig/fc-lang/Makefile.am
---- fontconfig.orig/fc-lang/Makefile.am 2009-06-24 19:52:10.000000000 +0200
-+++ fontconfig/fc-lang/Makefile.am 2010-01-11 17:56:56.000000000 +0100
-@@ -22,6 +22,8 @@
- # PERFORMANCE OF THIS SOFTWARE.
- #
-
-+CPPFLAGS =
-+CFLAGS =
- CC = @CC_FOR_BUILD@
- EXEEXT = @EXEEXT_FOR_BUILD@
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
=====================================
contrib/src/fontconfig/fontconfig-noxml2.patch deleted
=====================================
@@ -1,133 +0,0 @@
-diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c
---- fontconfig/src/fcxml.c 2014-07-06 00:38:32.773443543 +0200
-+++ fontconfig.new/src/fcxml.c 2014-07-05 21:11:51.171349523 +0200
-@@ -23,6 +23,8 @@
- */
-
- #include "fcint.h"
-+
-+#if 0
- #include <fcntl.h>
- #include <stdarg.h>
- #include <dirent.h>
-@@ -56,6 +58,8 @@
- #include <mbstring.h>
- #endif
-
-+#endif
-+
- static void
- FcExprDestroy (FcExpr *e);
-
-@@ -86,6 +90,7 @@
- FcRuleDestroy (n);
- }
-
-+#if 0
- static FcExpr *
- FcExprCreateInteger (FcConfig *config, int i)
- {
-@@ -132,6 +137,7 @@
- }
- return m;
- }
-+#endif
-
- static void
- FcExprMatrixFreeShallow (FcExprMatrix *m)
-@@ -156,6 +162,7 @@
- free (m);
- }
-
-+#if 0
- static FcExpr *
- FcExprCreateMatrix (FcConfig *config, const FcExprMatrix *matrix)
- {
-@@ -240,7 +247,7 @@
- }
- return e;
- }
--
-+#endif
- static void
- FcExprDestroy (FcExpr *e)
- {
-@@ -323,6 +330,7 @@
- free (e);
- }
-
-+#if 0
- typedef enum _FcElement {
- FcElementNone,
- FcElementFontconfig,
-@@ -2973,6 +2981,7 @@
- const FcChar8 *bs = *((FcChar8 **) b);
- return FcStrCmp (as, bs);
- }
-+#endif
-
- static FcBool
- FcConfigParseAndLoadDir (FcConfig *config,
-@@ -2980,6 +2989,9 @@
- const FcChar8 *dir,
- FcBool complain)
- {
-+ return FcFalse;
-+}
-+#if 0
- DIR *d;
- struct dirent *e;
- FcBool ret = FcTrue;
-@@ -3056,6 +3068,7 @@
- bail0:
- return ret || !complain;
- }
-+#endif
-
- #ifdef _WIN32
- pfnGetSystemWindowsDirectory pGetSystemWindowsDirectory = NULL;
-@@ -3067,7 +3080,10 @@
- const FcChar8 *name,
- FcBool complain)
- {
-+ return FcFalse;
-+}
-
-+#if 0
- XML_Parser p;
- FcChar8 *filename;
- int fd;
-@@ -3210,3 +3226,4 @@
- #define __fcxml__
- #include "fcaliastail.h"
- #undef __fcxml__
-+#endif
---- fontconfig-2.12.1/src/fcinit.c.orig 2017-04-08 11:38:02.488354178 +0200
-+++ fontconfig-2.12.1/src/fcinit.c 2017-04-08 11:38:52.072351969 +0200
-@@ -45,11 +45,16 @@
- if (!config)
- goto bail0;
- FcConfigSetSysRoot (config, sysroot);
-- if (!FcConfigAddDir (config, (FcChar8 *) FC_DEFAULT_FONTS))
-+ char path[MAX_PATH + 8];
-+ GetWindowsDirectory( path, MAX_PATH + 1 );
-+ strcat( path, "\\fonts" );
-+// printf( "Fonts dir: %s\n", path );
-+ if (!FcConfigAddDir (config, (FcChar8 *) path))
- goto bail1;
- char dir[MAX_PATH+5];
- SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, dir );
- strncat( dir, "\\vlc", 4 );
-+// printf( "Cache dir: %s\n", dir );
- if (!FcConfigAddCacheDir (config, (FcChar8 *)dir))
- goto bail1;
- return config;
-@@ -193,7 +202,7 @@
- FcCacheFini ();
- FcDefaultFini ();
- FcObjectFini ();
-- FcConfigPathFini ();
-+// FcConfigPathFini ();
- }
-
- /*
=====================================
contrib/src/fontconfig/fontconfig-win32.patch deleted
=====================================
@@ -1,42 +0,0 @@
---- fontconfig/src/fcinit.c 2009-06-06 00:59:27.000000000 +0200
-+++ fontconfig.good/src/fcinit.c 2009-07-13 14:58:37.000000000 +0200
-@@ -24,6 +24,7 @@
-
- #include "fcint.h"
- #include <stdlib.h>
-+# include <shlobj.h>
-
- static FcConfig *
- FcInitFallbackConfig (void)
-@@ -35,7 +36,10 @@
- goto bail0;
- if (!FcConfigAddDir (config, (FcChar8 *) FC_DEFAULT_FONTS))
- goto bail1;
-- if (!FcConfigAddCacheDir (config, (FcChar8 *) FC_CACHEDIR))
-+ char dir[MAX_PATH+5];
-+ SHGetFolderPath( NULL, CSIDL_APPDATA, NULL, 0, dir );
-+ strncat( dir, "\\vlc", 4 );
-+ if (!FcConfigAddCacheDir (config, (FcChar8 *)dir))
- goto bail1;
- return config;
-
---- fontconfig-2.11.1/src/Makefile.in.orig 2014-07-04 22:34:00.932627043 +0200
-+++ fontconfig-2.11.1/src/Makefile.in 2014-07-04 22:35:40.630938711 +0200
-@@ -838,7 +838,6 @@
-
- @OS_WIN32_TRUE at install-libtool-import-lib: libfontconfig.la
- @OS_WIN32_TRUE@ $(MKDIR_P) $(DESTDIR)$(libdir)
-- at OS_WIN32_TRUE@ $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a
- @OS_WIN32_TRUE@ $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
-
- @OS_WIN32_TRUE at uninstall-libtool-import-lib:
---- fontconfig-2.11.1/src/Makefile.am.orig 2014-07-04 22:34:00.932627043 +0200
-+++ fontconfig-2.11.1/src/Makefile.am 2014-07-04 22:37:05.362334747 +0200
-@@ -33,7 +33,6 @@
-
- install-libtool-import-lib: libfontconfig.la
- $(MKDIR_P) $(DESTDIR)$(libdir)
-- $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a
- $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
-
- uninstall-libtool-import-lib:
=====================================
contrib/src/fontconfig/rules.mak
=====================================
@@ -17,10 +17,6 @@ $(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.gz:
fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz .sum-fontconfig
$(UNPACK)
-ifdef HAVE_WIN32
- $(APPLY) $(SRC)/fontconfig/fontconfig-win32.patch
- $(APPLY) $(SRC)/fontconfig/fontconfig-noxml2.patch
-endif
$(RM) $(UNPACK_DIR)/src/fcobjshash.gperf
$(call pkg_static, "fontconfig.pc.in")
$(MOVE)
@@ -46,9 +42,6 @@ endif
DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)
.fontconfig: fontconfig
-ifdef HAVE_WIN32
- $(RECONF)
-endif
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(FONTCONFIG_CONF)
$(MAKE) -C $<
ifndef HAVE_MACOSX
=====================================
contrib/src/goom/goom2k4-autotools.patch
=====================================
@@ -9,10 +9,3 @@
libgoom2_la_LDFLAGS = -export-dynamic -export-symbols-regex "goom.*"
libgoom2_la_SOURCES = \
goomsl_yacc.y goomsl_lex.l goomsl.c goomsl_hash.c goomsl_heap.c \
---- goom/Makefile.am.orig 2010-10-31 21:43:45.514184001 +0100
-+++ goom/Makefile.am 2010-10-31 21:44:01.382194251 +0100
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = src xmms-goom sdl-goom @MACFOLDER@
-
- #.pc file
=====================================
contrib/src/goom/rules.mak
=====================================
@@ -34,7 +34,7 @@ endif
$(MOVE)
.goom: goom
- $(RECONF)
+ $(RECONF) -I m4
$(MAKEBUILDDIR)
$(MAKECONFIGURE)
+$(MAKEBUILD)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/93895d57d08656a5f64970c89d8f61b290cbf38f...c7bbf86effedefb31b705d5ea316cf1c32b8e67b
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/93895d57d08656a5f64970c89d8f61b290cbf38f...c7bbf86effedefb31b705d5ea316cf1c32b8e67b
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list