[vlc-commits] Move Freetype to a subfolder

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Nov 23 17:06:52 2015 +0100| [1e11d864b2d9871a616f197413ee187f369666a5] | committer: Jean-Baptiste Kempf

Move Freetype to a subfolder

It makes it more clear that text_layout* and platform_fonts* are
Freetype2 specific

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e11d864b2d9871a616f197413ee187f369666a5
---

 modules/text_renderer/Makefile.am                       |   14 +++++++-------
 modules/text_renderer/{ => freetype}/fonts/android.c    |    0
 modules/text_renderer/{ => freetype}/fonts/darwin.c     |    0
 modules/text_renderer/{ => freetype}/fonts/fontconfig.c |    0
 modules/text_renderer/{ => freetype}/fonts/win32.c      |    0
 modules/text_renderer/{ => freetype}/freetype.c         |    0
 modules/text_renderer/{ => freetype}/freetype.h         |    0
 modules/text_renderer/{ => freetype}/platform_fonts.c   |    0
 modules/text_renderer/{ => freetype}/platform_fonts.h   |    0
 modules/text_renderer/{ => freetype}/text_layout.c      |    0
 modules/text_renderer/{ => freetype}/text_layout.h      |    0
 po/POTFILES.in                                          |    2 +-
 12 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/text_renderer/Makefile.am b/modules/text_renderer/Makefile.am
index 70f9a28..2af3bd3 100644
--- a/modules/text_renderer/Makefile.am
+++ b/modules/text_renderer/Makefile.am
@@ -4,9 +4,9 @@ libtdummy_plugin_la_SOURCES = text_renderer/tdummy.c
 text_LTLIBRARIES = libtdummy_plugin.la
 
 libfreetype_plugin_la_SOURCES = \
-	text_renderer/platform_fonts.c text_renderer/platform_fonts.h \
-	text_renderer/freetype.c text_renderer/freetype.h \
-	text_renderer/text_layout.c text_renderer/text_layout.h
+	text_renderer/freetype/platform_fonts.c text_renderer/freetype/platform_fonts.h \
+	text_renderer/freetype/freetype.c text_renderer/freetype/freetype.h \
+	text_renderer/freetype/text_layout.c text_renderer/freetype/text_layout.h
 
 libfreetype_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
 libfreetype_plugin_la_LIBADD = $(LIBM) $(FREETYPE_LIBS)
@@ -14,20 +14,20 @@ libfreetype_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(FREETYPE_LDFLAGS) -rpath '$(text
 
 if HAVE_WIN32
 if !HAVE_WINSTORE
-libfreetype_plugin_la_SOURCES += text_renderer/fonts/win32.c
+libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/win32.c
 libfreetype_plugin_la_LIBADD += -liconv -lz -lgdi32 -lusp10
 endif
 endif
 if HAVE_FONTCONFIG
-libfreetype_plugin_la_SOURCES += text_renderer/fonts/fontconfig.c
+libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/fontconfig.c
 libfreetype_plugin_la_CPPFLAGS += -DHAVE_FONTCONFIG
 libfreetype_plugin_la_LIBADD += -lfontconfig
 endif
 if HAVE_ANDROID
-libfreetype_plugin_la_SOURCES += text_renderer/fonts/android.c
+libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/android.c
 endif
 if HAVE_DARWIN
-libfreetype_plugin_la_SOURCES += text_renderer/fonts/darwin.c
+libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/darwin.c
 libfreetype_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation -Wl,-framework,CoreText
 endif
 if HAVE_FRIBIDI
diff --git a/modules/text_renderer/fonts/android.c b/modules/text_renderer/freetype/fonts/android.c
similarity index 100%
rename from modules/text_renderer/fonts/android.c
rename to modules/text_renderer/freetype/fonts/android.c
diff --git a/modules/text_renderer/fonts/darwin.c b/modules/text_renderer/freetype/fonts/darwin.c
similarity index 100%
rename from modules/text_renderer/fonts/darwin.c
rename to modules/text_renderer/freetype/fonts/darwin.c
diff --git a/modules/text_renderer/fonts/fontconfig.c b/modules/text_renderer/freetype/fonts/fontconfig.c
similarity index 100%
rename from modules/text_renderer/fonts/fontconfig.c
rename to modules/text_renderer/freetype/fonts/fontconfig.c
diff --git a/modules/text_renderer/fonts/win32.c b/modules/text_renderer/freetype/fonts/win32.c
similarity index 100%
rename from modules/text_renderer/fonts/win32.c
rename to modules/text_renderer/freetype/fonts/win32.c
diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype/freetype.c
similarity index 100%
rename from modules/text_renderer/freetype.c
rename to modules/text_renderer/freetype/freetype.c
diff --git a/modules/text_renderer/freetype.h b/modules/text_renderer/freetype/freetype.h
similarity index 100%
rename from modules/text_renderer/freetype.h
rename to modules/text_renderer/freetype/freetype.h
diff --git a/modules/text_renderer/platform_fonts.c b/modules/text_renderer/freetype/platform_fonts.c
similarity index 100%
rename from modules/text_renderer/platform_fonts.c
rename to modules/text_renderer/freetype/platform_fonts.c
diff --git a/modules/text_renderer/platform_fonts.h b/modules/text_renderer/freetype/platform_fonts.h
similarity index 100%
rename from modules/text_renderer/platform_fonts.h
rename to modules/text_renderer/freetype/platform_fonts.h
diff --git a/modules/text_renderer/text_layout.c b/modules/text_renderer/freetype/text_layout.c
similarity index 100%
rename from modules/text_renderer/text_layout.c
rename to modules/text_renderer/freetype/text_layout.c
diff --git a/modules/text_renderer/text_layout.h b/modules/text_renderer/freetype/text_layout.h
similarity index 100%
rename from modules/text_renderer/text_layout.h
rename to modules/text_renderer/freetype/text_layout.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 95a7549..d3d3bb0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1061,7 +1061,7 @@ modules/stream_out/smem.c
 modules/stream_out/stats.c
 modules/stream_out/standard.c
 modules/stream_out/transcode/transcode.c
-modules/text_renderer/freetype.c
+modules/text_renderer/freetype/freetype.c
 modules/text_renderer/nsspeechsynthesizer.m
 modules/text_renderer/sapi.cpp
 modules/text_renderer/svg.c