Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update titan building v2.02 #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion make/contrib-libs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1738,7 +1738,7 @@ endif

ifeq ($(IMAGE), $(filter $(IMAGE), neutrino neutrino-wlandriver titan titan-wlandriver))
LIBXML2_CONF_OPTS = --without-python
ifeq ($(MEDIAFW), gstreamer)
ifeq ($(MEDIAFW), $(filter $(MEDIAFW), gstreamer gst-eplayer3 gst-eplayer3-dual))
LIBXML2_CONF_OPTS += --with-tree
LIBXML2_CONF_OPTS += --with-output
LIBXML2_CONF_OPTS += --with-sax1
Expand Down
5 changes: 5 additions & 0 deletions make/gstreamer.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ GSTREAMER_VER = 1.16.2
GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VER).tar.xz
GSTREAMER_PATCH = gstreamer-$(GSTREAMER_VER)-fix-crash-with-gst-inspect.patch
GSTREAMER_PATCH += gstreamer-$(GSTREAMER_VER)-revert-use-new-gst-adapter-get-buffer.patch
GSTREAMER_PATCH += gstreamer-$(GSTREAMER_VER)-fix-gnu-make-4.3-compatibility.patch

$(ARCHIVE)/$(GSTREAMER_SOURCE):
$(WGET) https://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER_SOURCE)
Expand All @@ -15,6 +16,7 @@ $(D)/gstreamer: $(D)/bootstrap $(D)/libglib2 $(D)/libxml2 $(D)/glib_networking $
$(UNTAR)/$(GSTREAMER_SOURCE)
$(CH_DIR)/gstreamer-$(GSTREAMER_VER); \
$(call apply_patches, $(GSTREAMER_PATCH)); \
autoreconf --force --install $(SILENT_OPT); \
$(CONFIGURE) \
--prefix=/usr \
--libexecdir=/usr/lib \
Expand Down Expand Up @@ -58,6 +60,7 @@ GST_PLUGINS_BASE_PATCH = gst-plugins-base-$(GST_PLUGINS_BASE_VER)-riff-media-ad
GST_PLUGINS_BASE_PATCH += gst-plugins-base-$(GST_PLUGINS_BASE_VER)-riff-media-added-fourcc-to-all-ffmpeg-mpeg4-video-ca.patch
GST_PLUGINS_BASE_PATCH += gst-plugins-base-$(GST_PLUGINS_BASE_VER)-subparse-avoid-false-negatives-dealing-with-UTF-8.patch
GST_PLUGINS_BASE_PATCH += gst-plugins-base-$(GST_PLUGINS_BASE_VER)-taglist-not-send-to-down-stream-if-all-the-frame-cor.patch
GST_PLUGINS_BASE_PATCH += gst-plugins-base-$(GST_PLUGINS_BASE_VER)-fix-gnu-make-4.3-compatibility.patch

$(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE):
$(WGET) https://gstreamer.freedesktop.org/src/gst-plugins-base/$(GST_PLUGINS_BASE_SOURCE)
Expand All @@ -68,6 +71,7 @@ $(D)/gst_plugins_base: $(D)/bootstrap $(D)/libglib2 $(D)/orc $(D)/gstreamer $(D)
$(UNTAR)/$(GST_PLUGINS_BASE_SOURCE)
$(CH_DIR)/gst-plugins-base-$(GST_PLUGINS_BASE_VER); \
$(call apply_patches, $(GST_PLUGINS_BASE_PATCH)); \
autoreconf --force --install $(SILENT_OPT); \
$(CONFIGURE) \
--prefix=/usr \
--datarootdir=/.remove \
Expand Down Expand Up @@ -166,6 +170,7 @@ GST_PLUGINS_BAD_PATCH = gst-plugins-bad-$(GST_PLUGINS_BAD_VER)-hls-use-max-play
GST_PLUGINS_BAD_PATCH += gst-plugins-bad-$(GST_PLUGINS_BAD_VER)-rtmp-fix-seeking-and-potential-segfault.patch
GST_PLUGINS_BAD_PATCH += gst-plugins-bad-$(GST_PLUGINS_BAD_VER)-mpegtsdemux-only-wait-for-PCR-when-PCR-pid.patch
GST_PLUGINS_BAD_PATCH += gst-plugins-bad-$(GST_PLUGINS_BAD_VER)-dvbapi5-fix-old-kernel.patch
GST_PLUGINS_BAD_PATCH += gst-plugins-bad-$(GST_PLUGINS_BAD_VER)-fix-gnu-make-4.3-compatibility.patch

$(ARCHIVE)/$(GST_PLUGINS_BAD_SOURCE):
$(WGET) https://gstreamer.freedesktop.org/src/gst-plugins-bad/$(GST_PLUGINS_BAD_SOURCE)
Expand Down
160 changes: 101 additions & 59 deletions make/titan.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# titan
#
TITAN_VER = 2.01
TITAN_VER = 2.02

TITAN_DEPS = $(D)/bootstrap
TITAN_DEPS += $(KERNEL)
Expand All @@ -17,22 +17,53 @@ TITAN_DEPS += $(D)/openssl
TITAN_DEPS += $(D)/timezone
TITAN_DEPS += $(D)/tools-titan-tools

T_CPPFLAGS += -DSH4
#T_CPPFLAGS += -DSH4NEW
T_CPPFLAGS += -DSSLNEW
T_CPPFLAGS += -DDDTBUILD
T_CPPFLAGS += -DDVDPLAYER
T_CPPFLAGS += -DCAMSUPP
T_LINKFLAGS = -lm -lpthread -ldl -lpng -lfreetype -ldreamdvd -ljpeg -lz -lmmeimage -lipkg

ifeq ($(MEDIAFW), eplayer3)
T_CONFIG_OPTS += --enable-eplayer3
#TITAN_DEPS += $(D)/tools-exteplayer3
TITAN_DEPS += $(D)/libcurl
TITAN_DEPS += $(D)/tools-exteplayer3
TITAN_DEPS += $(D)/libcurl
TITAN_DEPS += $(D)/ffmpeg
endif

ifeq ($(MEDIAFW), gstreamer)
TITAN_DEPS += $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_multibox_dvbmediasink
TITAN_DEPS += $(D)/gst_plugins_good $(D)/gst_plugins_bad $(D)/gst_plugins_ugly
TITAN_DEPS_ += $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_multibox_dvbmediasink
TITAN_DEPS += $(D)/gst_plugins_good $(D)/gst_plugins_bad $(D)/gst_plugins_ugly
endif

ifeq ($(MEDIAFW), gst-eplayer3)
TITAN_DEPS += $(D)/tools-exteplayer3
#TITAN_DEPS += $(D)/tools-exteplayer3
TITAN_DEPS += $(D)/libcurl
TITAN_DEPS += $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_multibox_dvbmediasink
TITAN_DEPS += $(D)/gst_plugins_good $(D)/gst_plugins_bad $(D)/gst_plugins_ugly
TITAN_DEPS += $(D)/tools-exteplayer3
TITAN_DEPS += $(D)/libcurl
TITAN_DEPS += $(D)/ffmpeg
TITAN_DEPS_ += $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_multibox_dvbmediasink
TITAN_DEPS += $(D)/gst_plugins_good $(D)/gst_plugins_bad $(D)/gst_plugins_ugly

T_CPPFLAGS += -DEPLAYER3
T_CPPFLAGS += -DEXTEPLAYER3
T_CPPFLAGS += -DEPLAYER4
T_CPPFLAGS += -DEXTGST
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/gstreamer-1.0
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/glib-2.0
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/libxml2
T_CPPFLAGS += -I$(TARGET_DIR)/usr/lib/glib-2.0/include
#T_CPPFLAGS += -I$(TOOLS_DIR)/exteplayer3/include
T_CPPFLAGS += -I$(SOURCE_DIR)/titan/libeplayer3/include
T_LINKFLAGS += -lssl -leplayer3 -lcrypto -lcurl -lglib-2.0 -lgobject-2.0 -lgio-2.0 -lgstreamer-1.0
#T_LINKFLAGS = -lglib-2.0 -lgobject-2.0 -lxml2 -lgstreamer-1.0 -leplayer3 -lpthread -ldl -lm -lz -lpng -lfreetype -ldreamdvd -ljpeg -lssl -lcrypto -lcurl -lipkg -lmmeimage
endif

TITAN_DEPS += $(LOCAL_TITAN_DEPS)
Expand Down Expand Up @@ -61,39 +92,22 @@ endif
T_CONFIG_OPTS +=$(LOCAL_TITAN_BUILD_OPTIONS)

T_CPPFLAGS += -DSH4
T_CPPFLAGS += -DSH4NEW
#T_CPPFLAGS += -DSH4NEW
T_CPPFLAGS += -DSSLNEW
T_CPPFLAGS += -DDDTBUILD
T_CPPFLAGS += -DDVDPLAYER
T_CPPFLAGS += -Wno-unused-but-set-variable
T_CPPFLAGS += -I$(DRIVER_DIR)/include
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/freetype2
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/openssl
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/libpng16
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/dreamdvd
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/libipkg
T_CPPFLAGS += -I$(KERNEL_DIR)/include
T_CPPFLAGS += -I$(DRIVER_DIR)/bpamem
T_CPPFLAGS += -I$(TOOLS_DIR)
T_CPPFLAGS += -I$(TOOLS_DIR)/libmme_image
T_CPPFLAGS += -L$(TARGET_DIR)/usr/lib
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/python
T_CPPFLAGS += -L$(SOURCE_DIR)/titan/libipkg
T_LINKFLAGS = -lm -lpthread -ldl -lpng -lfreetype -ldreamdvd -ljpeg -lz -lmmeimage -lipkg
T_CPPFLAGS += -DCAMSUPP
T_LINKFLAGS += -lm -lpthread -ldl -lpng -lfreetype -ldreamdvd -ljpeg -lz -lmmeimage -lipkg

ifeq ($(MEDIAFW), eplayer3)
TITAN_DEPS += $(D)/tools-exteplayer3
TITAN_DEPS += $(D)/libcurl
TITAN_DEPS += $(D)/ffmpeg
T_CPPFLAGS += -DEPLAYER3
T_CPPFLAGS += -DEXTEPLAYER3
T_CPPFLAGS += -I$(TOOLS_DIR)/exteplayer3/include
#T_CPPFLAGS += -I$(TOOLS_DIR)/exteplayer3/include
T_CPPFLAGS += -I$(SOURCE_DIR)/titan/libeplayer3/include
T_LINKFLAGS += -lssl -leplayer3 -lcrypto -lcurl
endif

ifeq ($(MEDIAFW), gstreamer)
TITAN_DEPS_ += $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_multibox_dvbmediasink
TITAN_DEPS += $(D)/gst_plugins_good $(D)/gst_plugins_bad $(D)/gst_plugins_ugly
T_CPPFLAGS += -DEPLAYER4
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/gstreamer-1.0
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/glib-2.0
Expand All @@ -103,21 +117,47 @@ T_LINKFLAGS += -lglib-2.0 -lgobject-2.0 -lgio-2.0 -lgstreamer-1.0
endif

ifeq ($(MEDIAFW), gst-explayer3)
TITAN_DEPS += $(D)/tools-exteplayer3
TITAN_DEPS += $(D)/libcurl
TITAN_DEPS += $(D)/ffmpeg
TITAN_DEPS_ += $(D)/gstreamer $(D)/gst_plugins_base $(D)/gst_plugins_multibox_dvbmediasink
TITAN_DEPS += $(D)/gst_plugins_good $(D)/gst_plugins_bad $(D)/gst_plugins_ugly
T_CPPFLAGS += -DEPLAYER3
T_CPPFLAGS += -DEXTEPLAYER3
T_CPPFLAGS += -DEPLAYER4
T_CPPFLAGS += -DEXTGST
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/gstreamer-1.0
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/glib-2.0
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/libxml2
T_CPPFLAGS += -I$(TARGET_DIR)/usr/lib/glib-2.0/include
T_CPPFLAGS += -I$(TOOLS_DIR)/exteplayer3/include
#T_CPPFLAGS += -I$(TOOLS_DIR)/exteplayer3/include
T_CPPFLAGS += -I$(SOURCE_DIR)/titan/libeplayer3/include
T_LINKFLAGS += -lssl -leplayer3 -lcrypto -lcurl -lglib-2.0 -lgobject-2.0 -lgio-2.0 -lgstreamer-1.0

T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/openssl
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/curl
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/openssl
T_CPPFLAGS += -I$(SOURCE_DIR)/titan/libeplayer3/include
T_CPPFLAGS += -I$(SOURCE_DIR)/titan/libdreamdvd
T_CPPFLAGS += -I$(SOURCE_DIR)/titan/include
T_CPPFLAGS += -I$(SOURCE_DIR)/titan

T_CPPFLAGS += -I$(TARGET_DIR)/usr/lib/gstreamer-1.0/include

endif

T_CPPFLAGS += -Wno-unused-but-set-variable
T_CPPFLAGS += -I$(DRIVER_DIR)/include
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/freetype2
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/openssl
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/libpng16
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/dreamdvd
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/libipkg
T_CPPFLAGS += -I$(KERNEL_DIR)/include
T_CPPFLAGS += -I$(DRIVER_DIR)/bpamem
T_CPPFLAGS += -I$(TOOLS_DIR)
T_CPPFLAGS += -I$(TOOLS_DIR)/libmme_image
T_CPPFLAGS += -L$(TARGET_DIR)/usr/lib
T_CPPFLAGS += -I$(TARGET_DIR)/usr/include/python
T_CPPFLAGS += -L$(SOURCE_DIR)/titan/libipkg
T_CPPFLAGS += -I$(SOURCE_DIR)/titan/libdreamdvd

T_CPPFLAGS += $(LOCAL_TITAN_CPPFLAGS)
T_CPPFLAGS += $(PLATFORM_CPPFLAGS)

Expand Down Expand Up @@ -149,9 +189,9 @@ yaud-titan-plugins: yaud-none $(D)/titan $(D)/titan-plugins $(D)/titan_release
# titan
#
REPO_TITAN=http://sbnc.dyndns.tv/svn/titan/
TITAN_PATCH = build-titan/titan-$(TITAN_VER).patch
TITAN_PATCH += build-titan/titan-$(TITAN_VER)_model.patch
TITAN_PATCH += build-titan/titan-$(TITAN_VER)_icon.patch
#TITAN_PATCH = build-titan/titan-$(TITAN_VER).patch
#TITAN_PATCH += build-titan/titan-$(TITAN_VER)_model.patch
#TITAN_PATCH += build-titan/titan-$(TITAN_VER)_icon.patch
#ifeq ($(MEDIAFW), $(filter $(MEDIAFW), eplayer3 gst-explayer3))
#TITAN_PATCH += build-titan/titan-$(TITAN_VER)_exteplayer3.patch
#endif
Expand Down Expand Up @@ -181,13 +221,14 @@ $(D)/titan.do_prepare: $(TITAN_DEPS)
$(call apply_patches, $(TITAN_PATCH)); \
cd $(SOURCE_DIR)/titan; \
cp ./libeplayer3/Makefile.am.sh4 ./libeplayer3/Makefile.am; \
echo "titan_LDADD = $(T_LINKFLAGS)" >> ./titan/Makefile.am.sh4; \
cp ./titan/Makefile.am.sh4 ./titan/Makefile.am; \
cp ./titan/Makefile.am.4.3 ./titan/Makefile.am; \
echo >> Makefile.am; \
echo "titan_LDADD = $(T_LINKFLAGS)" >> ./titan/Makefile.am; \
echo; \
touch $@

$(SOURCE_DIR)/titan/config.status: $(D)/titan.do_prepare
$(SILENT)cd $(SOURCE_DIR)/titan; \
$(SOURCE_DIR)/titan/titan/config.status: $(D)/titan.do_prepare
$(SILENT)cd $(SOURCE_DIR)/titan/titan; \
echo "Configuring titan..."; \
./autogen.sh $(SILENT_OPT); \
$(BUILDENV) \
Expand All @@ -207,13 +248,13 @@ $(SOURCE_DIR)/titan/config.status: $(D)/titan.do_prepare
PKG_CONFIG=$(PKG_CONFIG) \
CPPFLAGS="$(T_CPPFLAGS)"

$(D)/titan.do_compile: $(SOURCE_DIR)/titan/config.status
$(SILENT)cd $(SOURCE_DIR)/titan; \
$(D)/titan.do_compile: $(SOURCE_DIR)/titan/titan/config.status
$(SILENT)cd $(SOURCE_DIR)/titan/titan; \
$(MAKE) all
@touch $@

$(D)/titan: $(D)/titan-libipkg $(D)/titan-libdreamdvd $(D)/titan.do_compile
$(MAKE) -C $(SOURCE_DIR)/titan install DESTDIR=$(TARGET_DIR)
$(MAKE) -C $(SOURCE_DIR)/titan/titan install DESTDIR=$(TARGET_DIR)
@echo -n "Stripping..."
$(SILENT)if [ -e $(TARGET_DIR)/usr/bin/titan ]; then \
$(TARGET)-strip $(TARGET_DIR)/usr/bin/titan; \
Expand All @@ -228,7 +269,7 @@ $(D)/titan: $(D)/titan-libipkg $(D)/titan-libdreamdvd $(D)/titan.do_compile
#
# titan-plugins
#
TITAN_PLUGINS_PATCH = build-titan/titan-$(TITAN_VER)_plugins.patch
#TITAN_PLUGINS_PATCH = build-titan/titan-$(TITAN_VER)_plugins.patch
$(SOURCE_DIR)/titan/plugins/config.status: $(D)/titan.do_prepare
$(SILENT)cd $(SOURCE_DIR)/titan/plugins; \
echo "Configuring titan-plugins..."; \
Expand All @@ -252,25 +293,27 @@ $(SOURCE_DIR)/titan/plugins/config.status: $(D)/titan.do_prepare

$(D)/titan-plugins.do_compile: $(SOURCE_DIR)/titan/plugins/config.status
$(SILENT)cd $(SOURCE_DIR)/titan/plugins; \
./makesh4.sh $(KERNEL_STM) $(MEDIAFW) dev $(BOXTYPE) $(SOURCE_DIR) "$(T_CPPFLAGS)"
$(MAKE) all
# ./makesh4.sh stm24 1 nondev $(BOXTYPE) atemio sh4 $(SOURCE_DIR)/titan
@touch $@
ln -s $(SOURCE_DIR)/titan/plugins $(SOURCE_DIR)/titan/titan/plugins;

$(D)/titan-plugins: $(D)/titan.do_prepare $(D)/python
$(START_BUILD)
$(SILENT)cd $(SOURCE_DIR)/titan/plugins; \
cp ./plugins/network/networkbrowser/netlib/Makefile.sh4 ./plugins/network/networkbrowser/netlib/Makefile; \
cp ./network/networkbrowser/netlib/Makefile.sh4 ./network/networkbrowser/netlib/Makefile; \
echo "Configuring titan-plugins..."; \
./autogen.sh $(SILENT_OPT); \
aclocal $(ACLOCAL_FLAGS); \
libtoolize --automake -f -c; \
autoconf; \
autoheader; \
automake --add-missing; \
$(call apply_patches, $(TITAN_PLUGINS_PATCH)); \
$(BUILDENV) \
./configure $(SILENT_CONFIGURE) \
--build=$(BUILD) \
--host=$(TARGET) \
--datadir=/usr/local/share \
--libdir=/usr/lib \
--libdir=/var/usr/local/share/titan/plugins \
--bindir=/usr/local/bin \
--prefix=/usr \
--sysconfdir=/etc \
Expand All @@ -279,8 +322,9 @@ $(D)/titan-plugins: $(D)/titan.do_prepare $(D)/python
PKG_CONFIG=$(PKG_CONFIG) \
CPPFLAGS="$(T_CPPFLAGS)" \
; \
./makesh4.sh $(KERNEL_STM) $(MEDIAFW) dev $(BOXTYPE) $(SOURCE_DIR) "$(T_CPPFLAGS)"
# $(MAKE) -C $(SOURCE_DIR)/titan install DESTDIR=$(TARGET_DIR)
$(MAKE) -C $(SOURCE_DIR)/titan/plugins
cd $(SOURCE_DIR)/titan/titan; \
../plugins/inst.sh $(TARGET) $(TARGET_DIR);
$(SILENT)echo
$(TOUCH)

Expand Down Expand Up @@ -382,26 +426,24 @@ $(D)/titan-libeplayer3: $(D)/titan.do_prepare
$(MAKE) install DESTDIR=$(TARGET_DIR)
$(TOUCH)

titan-clean:
$(D)/titan-clean:
rm -f $(D)/titan
rm -f $(D)/titan.do_compile
cd $(SOURCE_DIR)/titan; \
$(MAKE) distclean
cd $(SOURCE_DIR)/titan/titan; \
$(MAKE) clean

titan-distclean:
$(D)/titan-distclean:
rm -f $(D)/titan
rm -f $(D)/titan.do_compile
rm -f $(D)/titan.do_prepare
rm -rf $(SOURCE_DIR)/titan
rm -rf $(SOURCE_DIR)/titan.org

titan-plugins-clean: titan-clean
$(D)/titan-plugins-clean: titan-clean
$(SILENT)rm -f $(D)/titan-plugins
$(SILENT)cd $(NP_OBJDIR); \
$(MAKE) -C $(NP_OBJDIR) clean
cd $(SOURCE_DIR)/titan/plugins; \
$(MAKE) clean

titan-plugins-distclean: $(D)/titan-distclean
$(D)/titan-plugins-distclean: $(D)/titan-distclean
$(SILENT)rm -f $(D)/titan-plugins
$(SILENT)cd $(NP_OBJDIR); \
$(MAKE) -C $(NP_OBJDIR) clean

11 changes: 11 additions & 0 deletions patches/ffmpeg-3.4.3-remove_diagnostics-color=auto.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/configure.org
+++ b/configure
@@ -6904,7 +6904,6 @@
check_cflags -Werror=return-type
check_cflags -Werror=vla
check_cflags -Wformat
- check_cflags -fdiagnostics-color=auto
enabled extra_warnings || check_disable_warning -Wno-maybe-uninitialized
if enabled x86_32; then
case $target_os in

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--- a/common/glib-gen.mak 2019-04-19 11:16:18.000000000 +0200
+++ b/common/glib-gen.mak.patched 2024-03-02 20:47:02.774711988 +0100
@@ -5,7 +5,8 @@
#glib_enum_define=GST_COLOR_BALANCE
#glib_enum_prefix=gst_color_balance

-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
+hash:=\#
+enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\")

# these are all the rules generating the relevant files
%-marshal.h: %-marshal.list--- a/common/gst-glib-gen.mak 2024-03-02 21:16:44.173251077 +0100
--- a/common/gst-glib-gen.mak 2019-04-19 11:16:18.000000000 +0200
+++ b/common/gst-glib-gen.mak.patched 2024-03-02 20:47:04.774711988 +0100
@@ -8,7 +8,8 @@
#glib_gen_decl_banner=GST_EXPORT
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>

-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
+hash:=\#
+enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\")

# these are all the rules generating the relevant files
$(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list

Loading