Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 705974 | Differences between
and this patch

Collapse All | Expand All

(-)gst-plugins-base-1.14.5.old/common/glib-gen.mak (-1 / +3 lines)
Lines 1-11 Link Here
1
# these are the variables your Makefile.am should set
1
# these are the variables your Makefile.am should set
2
# the example is based on the colorbalance interface
2
# the example is based on the colorbalance interface
3
3
4
H := \#
5
4
#glib_enum_headers=$(colorbalance_headers)
6
#glib_enum_headers=$(colorbalance_headers)
5
#glib_enum_define=GST_COLOR_BALANCE
7
#glib_enum_define=GST_COLOR_BALANCE
6
#glib_enum_prefix=gst_color_balance
8
#glib_enum_prefix=gst_color_balance
7
9
8
enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
10
enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
9
11
10
# these are all the rules generating the relevant files
12
# these are all the rules generating the relevant files
11
%-marshal.h: %-marshal.list
13
%-marshal.h: %-marshal.list
(-)gst-plugins-base-1.14.5.old/common/gst-glib-gen.mak (-2 / +4 lines)
Lines 1-14 Link Here
1
# these are the variables your Makefile.am should set
1
# these are the variables your Makefile.am should set
2
# the example is based on the colorbalance interface
2
# the example is based on the colorbalance interface
3
3
4
H := \#
5
4
#glib_enum_headers=$(colorbalance_headers)
6
#glib_enum_headers=$(colorbalance_headers)
5
#glib_enum_define=GST_COLOR_BALANCE
7
#glib_enum_define=GST_COLOR_BALANCE
6
#glib_gen_prefix=gst_color_balance
8
#glib_gen_prefix=gst_color_balance
7
#glib_gen_basename=colorbalance
9
#glib_gen_basename=colorbalance
8
#glib_gen_decl_banner=GST_EXPORT
10
#glib_gen_decl_banner=GST_EXPORT
9
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
11
#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
10
12
11
enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
13
enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
12
14
13
# these are all the rules generating the relevant files
15
# these are all the rules generating the relevant files
14
$(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
16
$(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
(-)gst-plugins-base-1.14.5.old/gst/encoding/Makefile.in (-2 / +4 lines)
Lines 17-28 Link Here
17
# these are the variables your Makefile.am should set
17
# these are the variables your Makefile.am should set
18
# the example is based on the colorbalance interface
18
# the example is based on the colorbalance interface
19
19
20
H := \#
21
20
#glib_enum_headers=$(colorbalance_headers)
22
#glib_enum_headers=$(colorbalance_headers)
21
#glib_enum_define=GST_COLOR_BALANCE
23
#glib_enum_define=GST_COLOR_BALANCE
22
#glib_gen_prefix=gst_color_balance
24
#glib_gen_prefix=gst_color_balance
23
#glib_gen_basename=colorbalance
25
#glib_gen_basename=colorbalance
24
#glib_gen_decl_banner=GST_EXPORT
26
#glib_gen_decl_banner=GST_EXPORT
25
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
27
#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
26
28
27
29
28
VPATH = @srcdir@
30
VPATH = @srcdir@
Lines 638-644 Link Here
638
	gstsmartencoder.h	\
640
	gstsmartencoder.h	\
639
	gststreamcombinerpad.h
641
	gststreamcombinerpad.h
640
642
641
enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
643
enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
642
all: all-am
644
all: all-am
643
645
644
.SUFFIXES:
646
.SUFFIXES:
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/app/Makefile.am (-1 / +3 lines)
Lines 1-10 Link Here
1
lib_LTLIBRARIES = libgstapp-@GST_API_VERSION@.la
1
lib_LTLIBRARIES = libgstapp-@GST_API_VERSION@.la
2
2
3
H := \#
4
3
glib_enum_define = GST_APP
5
glib_enum_define = GST_APP
4
glib_gen_prefix = __gst_app
6
glib_gen_prefix = __gst_app
5
glib_gen_basename = app
7
glib_gen_basename = app
6
glib_gen_decl_banner=GST_APP_API
8
glib_gen_decl_banner=GST_APP_API
7
glib_gen_decl_include=\#include <gst/app/app-prelude.h>
9
glib_gen_decl_include=$(H)include <gst/app/app-prelude.h>
8
10
9
glib_enum_headers = gstappsrc.h
11
glib_enum_headers = gstappsrc.h
10
12
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/app/Makefile.in (-3 / +5 lines)
Lines 17-28 Link Here
17
# these are the variables your Makefile.am should set
17
# these are the variables your Makefile.am should set
18
# the example is based on the colorbalance interface
18
# the example is based on the colorbalance interface
19
19
20
H := \#
21
20
#glib_enum_headers=$(colorbalance_headers)
22
#glib_enum_headers=$(colorbalance_headers)
21
#glib_enum_define=GST_COLOR_BALANCE
23
#glib_enum_define=GST_COLOR_BALANCE
22
#glib_gen_prefix=gst_color_balance
24
#glib_gen_prefix=gst_color_balance
23
#glib_gen_basename=colorbalance
25
#glib_gen_basename=colorbalance
24
#glib_gen_decl_banner=GST_EXPORT
26
#glib_gen_decl_banner=GST_EXPORT
25
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
27
#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
26
28
27
29
28
30
Lines 618-629 Link Here
618
glib_gen_prefix = __gst_app
620
glib_gen_prefix = __gst_app
619
glib_gen_basename = app
621
glib_gen_basename = app
620
glib_gen_decl_banner = GST_APP_API
622
glib_gen_decl_banner = GST_APP_API
621
glib_gen_decl_include = \#include <gst/app/app-prelude.h>
623
glib_gen_decl_include = $(H)include <gst/app/app-prelude.h>
622
glib_enum_headers = gstappsrc.h
624
glib_enum_headers = gstappsrc.h
623
built_sources = app-enumtypes.c
625
built_sources = app-enumtypes.c
624
built_headers = app-enumtypes.h
626
built_headers = app-enumtypes.h
625
BUILT_SOURCES = $(built_sources) $(built_headers)
627
BUILT_SOURCES = $(built_sources) $(built_headers)
626
enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
628
enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
627
libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c
629
libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c
628
nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
630
nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
629
libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
631
libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/audio/Makefile.am (-1 / +3 lines)
Lines 2-7 Link Here
2
ORC_SOURCE=gstaudiopack
2
ORC_SOURCE=gstaudiopack
3
include $(top_srcdir)/common/orc.mak
3
include $(top_srcdir)/common/orc.mak
4
4
5
H := \#
6
5
glib_enum_headers= 		\
7
glib_enum_headers= 		\
6
	audio.h			\
8
	audio.h			\
7
	audio-format.h			\
9
	audio-format.h			\
Lines 20-26 Link Here
20
glib_gen_prefix = gst_audio
22
glib_gen_prefix = gst_audio
21
glib_gen_basename = audio
23
glib_gen_basename = audio
22
glib_gen_decl_banner=GST_AUDIO_API
24
glib_gen_decl_banner=GST_AUDIO_API
23
glib_gen_decl_include=\#include <gst/audio/audio-prelude.h>
25
glib_gen_decl_include=$(H)include <gst/audio/audio-prelude.h>
24
26
25
built_sources = audio-enumtypes.c
27
built_sources = audio-enumtypes.c
26
built_headers = audio-enumtypes.h
28
built_headers = audio-enumtypes.h
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/audio/Makefile.in (-3 / +5 lines)
Lines 39-50 Link Here
39
# these are the variables your Makefile.am should set
39
# these are the variables your Makefile.am should set
40
# the example is based on the colorbalance interface
40
# the example is based on the colorbalance interface
41
41
42
H := \#
43
42
#glib_enum_headers=$(colorbalance_headers)
44
#glib_enum_headers=$(colorbalance_headers)
43
#glib_enum_define=GST_COLOR_BALANCE
45
#glib_enum_define=GST_COLOR_BALANCE
44
#glib_gen_prefix=gst_color_balance
46
#glib_gen_prefix=gst_color_balance
45
#glib_gen_basename=colorbalance
47
#glib_gen_basename=colorbalance
46
#glib_gen_decl_banner=GST_EXPORT
48
#glib_gen_decl_banner=GST_EXPORT
47
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
49
#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
48
50
49
51
50
52
Lines 784-790 Link Here
784
glib_gen_prefix = gst_audio
786
glib_gen_prefix = gst_audio
785
glib_gen_basename = audio
787
glib_gen_basename = audio
786
glib_gen_decl_banner = GST_AUDIO_API
788
glib_gen_decl_banner = GST_AUDIO_API
787
glib_gen_decl_include = \#include <gst/audio/audio-prelude.h>
789
glib_gen_decl_include = $(H)include <gst/audio/audio-prelude.h>
788
built_sources = audio-enumtypes.c
790
built_sources = audio-enumtypes.c
789
built_headers = audio-enumtypes.h
791
built_headers = audio-enumtypes.h
790
lib_LTLIBRARIES = \
792
lib_LTLIBRARIES = \
Lines 895-901 Link Here
895
@HAVE_X86_TRUE@	$(GST_LIB_LDFLAGS) \
897
@HAVE_X86_TRUE@	$(GST_LIB_LDFLAGS) \
896
@HAVE_X86_TRUE@	$(GST_ALL_LDFLAGS)
898
@HAVE_X86_TRUE@	$(GST_ALL_LDFLAGS)
897
899
898
enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
900
enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
899
901
900
# Introspection
902
# Introspection
901
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir
903
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/pbutils/Makefile.am (-1 / +3 lines)
Lines 12-24 Link Here
12
	gstdiscoverer.h \
12
	gstdiscoverer.h \
13
	gstaudiovisualizer.h
13
	gstaudiovisualizer.h
14
14
15
H := \#
16
15
# variables used for enum/marshal generation
17
# variables used for enum/marshal generation
16
glib_enum_headers = $(headers_pbutils)
18
glib_enum_headers = $(headers_pbutils)
17
glib_enum_define = PB_UTILS
19
glib_enum_define = PB_UTILS
18
glib_gen_prefix = pbutils
20
glib_gen_prefix = pbutils
19
glib_gen_basename = pbutils
21
glib_gen_basename = pbutils
20
glib_gen_decl_banner=GST_PBUTILS_API
22
glib_gen_decl_banner=GST_PBUTILS_API
21
glib_gen_decl_include=\#include <gst/pbutils/pbutils-prelude.h>
23
glib_gen_decl_include=$(H)include <gst/pbutils/pbutils-prelude.h>
22
24
23
built_headers_configure = \
25
built_headers_configure = \
24
	gstpluginsbaseversion.h
26
	gstpluginsbaseversion.h
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/pbutils/Makefile.in (-3 / +5 lines)
Lines 17-28 Link Here
17
# these are the variables your Makefile.am should set
17
# these are the variables your Makefile.am should set
18
# the example is based on the colorbalance interface
18
# the example is based on the colorbalance interface
19
19
20
H := \#
21
20
#glib_enum_headers=$(colorbalance_headers)
22
#glib_enum_headers=$(colorbalance_headers)
21
#glib_enum_define=GST_COLOR_BALANCE
23
#glib_enum_define=GST_COLOR_BALANCE
22
#glib_gen_prefix=gst_color_balance
24
#glib_gen_prefix=gst_color_balance
23
#glib_gen_basename=colorbalance
25
#glib_gen_basename=colorbalance
24
#glib_gen_decl_banner=GST_EXPORT
26
#glib_gen_decl_banner=GST_EXPORT
25
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
27
#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
26
28
27
29
28
30
Lines 671-677 Link Here
671
glib_gen_prefix = pbutils
673
glib_gen_prefix = pbutils
672
glib_gen_basename = pbutils
674
glib_gen_basename = pbutils
673
glib_gen_decl_banner = GST_PBUTILS_API
675
glib_gen_decl_banner = GST_PBUTILS_API
674
glib_gen_decl_include = \#include <gst/pbutils/pbutils-prelude.h>
676
glib_gen_decl_include = $(H)include <gst/pbutils/pbutils-prelude.h>
675
built_headers_configure = \
677
built_headers_configure = \
676
	gstpluginsbaseversion.h
678
	gstpluginsbaseversion.h
677
679
Lines 719-725 Link Here
719
721
720
# DISTCLEANFILES is for files generated by configure
722
# DISTCLEANFILES is for files generated by configure
721
DISTCLEANFILES = $(built_headers_configure)
723
DISTCLEANFILES = $(built_headers_configure)
722
enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
724
enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
723
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_API_VERSION@.gir
725
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_API_VERSION@.gir
724
@HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
726
@HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
725
@HAVE_INTROSPECTION_TRUE@	$(libgstpbutils_@GST_API_VERSION@include_HEADERS)) \
727
@HAVE_INTROSPECTION_TRUE@	$(libgstpbutils_@GST_API_VERSION@include_HEADERS)) \
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/rtp/Makefile.am (-1 / +3 lines)
Lines 35-46 Link Here
35
BUILT_SOURCES = $(built_headers) $(built_sources)
35
BUILT_SOURCES = $(built_headers) $(built_sources)
36
CLEANFILES = $(BUILT_SOURCES)
36
CLEANFILES = $(BUILT_SOURCES)
37
37
38
H := \#
39
38
glib_gen_prefix = __gst_rtp
40
glib_gen_prefix = __gst_rtp
39
glib_enum_define = gst_rtp
41
glib_enum_define = gst_rtp
40
glib_enum_headers = $(libgstrtpinclude_HEADERS)
42
glib_enum_headers = $(libgstrtpinclude_HEADERS)
41
glib_gen_basename = gstrtp
43
glib_gen_basename = gstrtp
42
glib_gen_decl_banner=GST_RTP_API
44
glib_gen_decl_banner=GST_RTP_API
43
glib_gen_decl_include=\#include <gst/rtp/rtp-prelude.h>
45
glib_gen_decl_include=$(H)include <gst/rtp/rtp-prelude.h>
44
46
45
include $(top_srcdir)/common/gst-glib-gen.mak
47
include $(top_srcdir)/common/gst-glib-gen.mak
46
48
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/rtp/Makefile.in (-3 / +5 lines)
Lines 17-28 Link Here
17
# these are the variables your Makefile.am should set
17
# these are the variables your Makefile.am should set
18
# the example is based on the colorbalance interface
18
# the example is based on the colorbalance interface
19
19
20
H := \#
21
20
#glib_enum_headers=$(colorbalance_headers)
22
#glib_enum_headers=$(colorbalance_headers)
21
#glib_enum_define=GST_COLOR_BALANCE
23
#glib_enum_define=GST_COLOR_BALANCE
22
#glib_gen_prefix=gst_color_balance
24
#glib_gen_prefix=gst_color_balance
23
#glib_gen_basename=colorbalance
25
#glib_gen_basename=colorbalance
24
#glib_gen_decl_banner=GST_EXPORT
26
#glib_gen_decl_banner=GST_EXPORT
25
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
27
#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
26
28
27
29
28
30
Lines 675-682 Link Here
675
glib_enum_headers = $(libgstrtpinclude_HEADERS)
677
glib_enum_headers = $(libgstrtpinclude_HEADERS)
676
glib_gen_basename = gstrtp
678
glib_gen_basename = gstrtp
677
glib_gen_decl_banner = GST_RTP_API
679
glib_gen_decl_banner = GST_RTP_API
678
glib_gen_decl_include = \#include <gst/rtp/rtp-prelude.h>
680
glib_gen_decl_include = $(H)include <gst/rtp/rtp-prelude.h>
679
enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
681
enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
680
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir
682
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir
681
@HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
683
@HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
682
@HAVE_INTROSPECTION_TRUE@	$(libgstrtpinclude_HEADERS)) \
684
@HAVE_INTROSPECTION_TRUE@	$(libgstrtpinclude_HEADERS)) \
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/rtsp/Makefile.am (-1 / +3 lines)
Lines 41-52 Link Here
41
BUILT_SOURCES = $(built_headers) $(built_sources)
41
BUILT_SOURCES = $(built_headers) $(built_sources)
42
CLEANFILES = $(BUILT_SOURCES)
42
CLEANFILES = $(BUILT_SOURCES)
43
43
44
H := \#
45
44
glib_gen_prefix = __gst_rtsp
46
glib_gen_prefix = __gst_rtsp
45
glib_enum_define = gst_rtsp
47
glib_enum_define = gst_rtsp
46
glib_enum_headers = $(libgstrtspinclude_HEADERS)
48
glib_enum_headers = $(libgstrtspinclude_HEADERS)
47
glib_gen_basename = gstrtsp
49
glib_gen_basename = gstrtsp
48
glib_gen_decl_banner=GST_RTSP_API
50
glib_gen_decl_banner=GST_RTSP_API
49
glib_gen_decl_include=\#include <gst/rtsp/rtsp-prelude.h>
51
glib_gen_decl_include=$(H)include <gst/rtsp/rtsp-prelude.h>
50
52
51
include $(top_srcdir)/common/gst-glib-gen.mak
53
include $(top_srcdir)/common/gst-glib-gen.mak
52
54
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/rtsp/Makefile.in (-3 / +5 lines)
Lines 17-28 Link Here
17
# these are the variables your Makefile.am should set
17
# these are the variables your Makefile.am should set
18
# the example is based on the colorbalance interface
18
# the example is based on the colorbalance interface
19
19
20
H := \#
21
20
#glib_enum_headers=$(colorbalance_headers)
22
#glib_enum_headers=$(colorbalance_headers)
21
#glib_enum_define=GST_COLOR_BALANCE
23
#glib_enum_define=GST_COLOR_BALANCE
22
#glib_gen_prefix=gst_color_balance
24
#glib_gen_prefix=gst_color_balance
23
#glib_gen_basename=colorbalance
25
#glib_gen_basename=colorbalance
24
#glib_gen_decl_banner=GST_EXPORT
26
#glib_gen_decl_banner=GST_EXPORT
25
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
27
#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
26
28
27
29
28
30
Lines 679-686 Link Here
679
glib_enum_headers = $(libgstrtspinclude_HEADERS)
681
glib_enum_headers = $(libgstrtspinclude_HEADERS)
680
glib_gen_basename = gstrtsp
682
glib_gen_basename = gstrtsp
681
glib_gen_decl_banner = GST_RTSP_API
683
glib_gen_decl_banner = GST_RTSP_API
682
glib_gen_decl_include = \#include <gst/rtsp/rtsp-prelude.h>
684
glib_gen_decl_include = $(H)include <gst/rtsp/rtsp-prelude.h>
683
enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
685
enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
684
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir
686
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir
685
@HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
687
@HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
686
@HAVE_INTROSPECTION_TRUE@	$(libgstrtspinclude_HEADERS)) \
688
@HAVE_INTROSPECTION_TRUE@	$(libgstrtspinclude_HEADERS)) \
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/tag/Makefile.am (-1 / +3 lines)
Lines 1-11 Link Here
1
libgsttagincludedir = \
1
libgsttagincludedir = \
2
	$(includedir)/gstreamer-@GST_API_VERSION@/gst/tag
2
	$(includedir)/gstreamer-@GST_API_VERSION@/gst/tag
3
3
4
H := \#
5
4
glib_enum_define = GST_TAG
6
glib_enum_define = GST_TAG
5
glib_gen_prefix = gst_tag
7
glib_gen_prefix = gst_tag
6
glib_gen_basename = tag
8
glib_gen_basename = tag
7
glib_gen_decl_banner=GST_TAG_API
9
glib_gen_decl_banner=GST_TAG_API
8
glib_gen_decl_include=\#include <gst/tag/tag-prelude.h>
10
glib_gen_decl_include=$(H)include <gst/tag/tag-prelude.h>
9
11
10
glib_enum_headers = tag.h gsttagdemux.h
12
glib_enum_headers = tag.h gsttagdemux.h
11
13
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/tag/Makefile.in (-3 / +5 lines)
Lines 17-28 Link Here
17
# these are the variables your Makefile.am should set
17
# these are the variables your Makefile.am should set
18
# the example is based on the colorbalance interface
18
# the example is based on the colorbalance interface
19
19
20
H := \#
21
20
#glib_enum_headers=$(colorbalance_headers)
22
#glib_enum_headers=$(colorbalance_headers)
21
#glib_enum_define=GST_COLOR_BALANCE
23
#glib_enum_define=GST_COLOR_BALANCE
22
#glib_gen_prefix=gst_color_balance
24
#glib_gen_prefix=gst_color_balance
23
#glib_gen_basename=colorbalance
25
#glib_gen_basename=colorbalance
24
#glib_gen_decl_banner=GST_EXPORT
26
#glib_gen_decl_banner=GST_EXPORT
25
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
27
#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
26
28
27
29
28
30
Lines 680-691 Link Here
680
glib_gen_prefix = gst_tag
682
glib_gen_prefix = gst_tag
681
glib_gen_basename = tag
683
glib_gen_basename = tag
682
glib_gen_decl_banner = GST_TAG_API
684
glib_gen_decl_banner = GST_TAG_API
683
glib_gen_decl_include = \#include <gst/tag/tag-prelude.h>
685
glib_gen_decl_include = $(H)include <gst/tag/tag-prelude.h>
684
glib_enum_headers = tag.h gsttagdemux.h
686
glib_enum_headers = tag.h gsttagdemux.h
685
built_sources = tag-enumtypes.c
687
built_sources = tag-enumtypes.c
686
built_headers = tag-enumtypes.h
688
built_headers = tag-enumtypes.h
687
BUILT_SOURCES = $(built_sources) $(built_headers)
689
BUILT_SOURCES = $(built_sources) $(built_headers)
688
enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
690
enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
689
libgsttaginclude_HEADERS = \
691
libgsttaginclude_HEADERS = \
690
	tag.h tag-prelude.h gsttagdemux.h gsttagmux.h xmpwriter.h
692
	tag.h tag-prelude.h gsttagdemux.h gsttagmux.h xmpwriter.h
691
693
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/video/Makefile.am (-1 / +3 lines)
Lines 2-7 Link Here
2
ORC_SOURCE=video-orc
2
ORC_SOURCE=video-orc
3
include $(top_srcdir)/common/orc.mak
3
include $(top_srcdir)/common/orc.mak
4
4
5
H := \#
6
5
glib_enum_headers = video.h video-format.h video-color.h video-info.h video-dither.h \
7
glib_enum_headers = video.h video-format.h video-color.h video-info.h video-dither.h \
6
			colorbalance.h navigation.h video-chroma.h video-tile.h video-converter.h \
8
			colorbalance.h navigation.h video-chroma.h video-tile.h video-converter.h \
7
			video-resampler.h video-frame.h video-scaler.h
9
			video-resampler.h video-frame.h video-scaler.h
Lines 9-15 Link Here
9
glib_gen_prefix = gst_video
11
glib_gen_prefix = gst_video
10
glib_gen_basename = video
12
glib_gen_basename = video
11
glib_gen_decl_banner=GST_VIDEO_API
13
glib_gen_decl_banner=GST_VIDEO_API
12
glib_gen_decl_include=\#include <gst/video/video-prelude.h>
14
glib_gen_decl_include=$(H)include <gst/video/video-prelude.h>
13
15
14
built_sources = video-enumtypes.c
16
built_sources = video-enumtypes.c
15
built_headers = video-enumtypes.h
17
built_headers = video-enumtypes.h
(-)gst-plugins-base-1.14.5.old/gst-libs/gst/video/Makefile.in (-3 / +5 lines)
Lines 39-50 Link Here
39
# these are the variables your Makefile.am should set
39
# these are the variables your Makefile.am should set
40
# the example is based on the colorbalance interface
40
# the example is based on the colorbalance interface
41
41
42
H := \#
43
42
#glib_enum_headers=$(colorbalance_headers)
44
#glib_enum_headers=$(colorbalance_headers)
43
#glib_enum_define=GST_COLOR_BALANCE
45
#glib_enum_define=GST_COLOR_BALANCE
44
#glib_gen_prefix=gst_color_balance
46
#glib_gen_prefix=gst_color_balance
45
#glib_gen_basename=colorbalance
47
#glib_gen_basename=colorbalance
46
#glib_gen_decl_banner=GST_EXPORT
48
#glib_gen_decl_banner=GST_EXPORT
47
#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
49
#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
48
50
49
51
50
52
Lines 740-746 Link Here
740
glib_gen_prefix = gst_video
742
glib_gen_prefix = gst_video
741
glib_gen_basename = video
743
glib_gen_basename = video
742
glib_gen_decl_banner = GST_VIDEO_API
744
glib_gen_decl_banner = GST_VIDEO_API
743
glib_gen_decl_include = \#include <gst/video/video-prelude.h>
745
glib_gen_decl_include = $(H)include <gst/video/video-prelude.h>
744
built_sources = video-enumtypes.c
746
built_sources = video-enumtypes.c
745
built_headers = video-enumtypes.h
747
built_headers = video-enumtypes.h
746
lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la
748
lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la
Lines 821-827 Link Here
821
823
822
libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
824
libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
823
libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
825
libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
824
enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
826
enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
825
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_API_VERSION@.gir
827
@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_API_VERSION@.gir
826
@HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
828
@HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
827
@HAVE_INTROSPECTION_TRUE@	$(libgstvideo_@GST_API_VERSION@include_HEADERS)) \
829
@HAVE_INTROSPECTION_TRUE@	$(libgstvideo_@GST_API_VERSION@include_HEADERS)) \

Return to bug 705974