-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathfaac-1.28-with_mp4.diff
208 lines (190 loc) · 7.68 KB
/
faac-1.28-with_mp4.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
diff -u -r faac-1.28-orig/common/mp4v2/Makefile.am faac-1.28/common/mp4v2/Makefile.am
--- faac-1.28-orig/common/mp4v2/Makefile.am 2009-01-25 03:14:34.000000000 +0200
+++ faac-1.28/common/mp4v2/Makefile.am 2009-03-21 18:10:33.000000000 +0200
@@ -2,11 +2,11 @@
AM_CXXFLAGS = -Wall
-noinst_LIBRARIES = libmp4v2.a
+LIBRARIES = libmp4v2.la
-noinst_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h
+HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h
-libmp4v2_a_SOURCES = \
+libmp4v2_la_SOURCES = \
3gp.cpp \
atom_amr.cpp \
atom_avc1.cpp \
diff -u -r faac-1.28-orig/common/mp4v2/Makefile.in faac-1.28/common/mp4v2/Makefile.in
--- faac-1.28-orig/common/mp4v2/Makefile.in 2009-02-10 10:37:00.000000000 +0200
+++ faac-1.28/common/mp4v2/Makefile.in 2009-03-22 09:53:09.000000000 +0200
@@ -38,7 +38,7 @@
build_triplet = @build@
host_triplet = @host@
subdir = common/mp4v2
-DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = README $(HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in TODO
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -47,11 +47,12 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = mpeg4ip_config.h
-LIBRARIES = $(noinst_LIBRARIES)
+LIBRARIES_INSTALL = $(INSTALL)
+LIBRARIES = $(LIBRARIES)
ARFLAGS = cru
libmp4v2_a_AR = $(AR) $(ARFLAGS)
-libmp4v2_a_LIBADD =
-am_libmp4v2_a_OBJECTS = 3gp.$(OBJEXT) atom_amr.$(OBJEXT) \
+libmp4v2_la_LIBADD =
+am_libmp4v2_la_OBJECTS = 3gp.$(OBJEXT) atom_amr.$(OBJEXT) \
atom_avc1.$(OBJEXT) atom_avcC.$(OBJEXT) atom_d263.$(OBJEXT) \
atom_damr.$(OBJEXT) atom_dref.$(OBJEXT) atom_elst.$(OBJEXT) \
atom_enca.$(OBJEXT) atom_encv.$(OBJEXT) atom_free.$(OBJEXT) \
@@ -74,7 +75,7 @@
mp4property.$(OBJEXT) mp4track.$(OBJEXT) mp4util.$(OBJEXT) \
ocidescriptors.$(OBJEXT) odcommands.$(OBJEXT) \
qosqualifiers.$(OBJEXT) rtphint.$(OBJEXT) virtual_io.$(OBJEXT)
-libmp4v2_a_OBJECTS = $(am_libmp4v2_a_OBJECTS)
+libmp4v2_la_OBJECTS = $(am_libmp4v2_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -94,9 +95,10 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libmp4v2_a_SOURCES)
-DIST_SOURCES = $(libmp4v2_a_SOURCES)
-HEADERS = $(noinst_HEADERS)
+SOURCES = $(libmp4v2_la_SOURCES)
+DIST_SOURCES = $(libmp4v2_la_SOURCES)
+HEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -207,9 +209,9 @@
target_alias = @target_alias@
INCLUDES = -I$(top_srcdir)/include
AM_CXXFLAGS = -Wall
-noinst_LIBRARIES = libmp4v2.a
-noinst_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h
-libmp4v2_a_SOURCES = \
+LIBRARIES = libmp4v2.la
+HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h
+libmp4v2_la_SOURCES = \
3gp.cpp \
atom_amr.cpp \
atom_avc1.cpp \
@@ -332,12 +334,29 @@
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libmp4v2.a: $(libmp4v2_a_OBJECTS) $(libmp4v2_a_DEPENDENCIES)
- -rm -f libmp4v2.a
- $(libmp4v2_a_AR) libmp4v2.a $(libmp4v2_a_OBJECTS) $(libmp4v2_a_LIBADD)
- $(RANLIB) libmp4v2.a
+install-LIBRARIES: $(LIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(LIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=install $(LIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(LIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-LIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @set -x; list='$(LIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+
+clean-LIBRARIES:
+ -test -z "$(LIBRARIES)" || rm -f $(LIBRARIES)
+libmp4v2.la: $(libmp4v2_la_OBJECTS) $(libmp4v2_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libmp4v2_la_LDFLAGS) $(libmp4v2_la_OBJECTS) $(libmp4v2_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -441,6 +460,23 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-HEADERS: $(HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(HEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(HEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+
+uninstall-HEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(HEADERS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -547,7 +583,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+clean-am: clean-generic clean-libtool clean-LIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -566,11 +602,11 @@
info-am:
-install-data-am:
+install-data-am: install-HEADERS
-install-exec-am:
+install-exec-am: install-LIBRARIES
-install-info: install-info-am
+instal-info: install-info-am
install-man:
@@ -597,7 +633,7 @@
uninstall-am: uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLIBRARIES ctags distclean \
+ clean-libtool clean-LIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
diff -u -r faac-1.28-orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am
--- faac-1.28-orig/frontend/Makefile.am 2008-12-16 02:56:00.000000000 +0200
+++ faac-1.28/frontend/Makefile.am 2009-03-21 18:10:33.000000000 +0200
@@ -5,7 +5,7 @@
if WITH_MP4V2
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
-LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
+LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
else
INCLUDES = -I$(top_srcdir)/include
LDADD = $(top_builddir)/libfaac/libfaac.la -lm
diff -u -r faac-1.28-orig/frontend/Makefile.in faac-1.28/frontend/Makefile.in
--- faac-1.28-orig/frontend/Makefile.in 2009-02-10 10:37:00.000000000 +0200
+++ faac-1.28/frontend/Makefile.in 2009-03-21 18:10:33.000000000 +0200
@@ -56,7 +56,7 @@
@WITH_MP4V2_FALSE@ $(top_builddir)/libfaac/libfaac.la
@WITH_MP4V2_TRUE@faac_DEPENDENCIES = \
@WITH_MP4V2_TRUE@ $(top_builddir)/libfaac/libfaac.la \
-@WITH_MP4V2_TRUE@ $(top_srcdir)/common/mp4v2/libmp4v2.a
+@WITH_MP4V2_TRUE@ $(top_srcdir)/common/mp4v2/libmp4v2.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -186,7 +186,7 @@
@WITH_MP4V2_FALSE@INCLUDES = -I$(top_srcdir)/include
@WITH_MP4V2_TRUE@INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
@WITH_MP4V2_FALSE@LDADD = $(top_builddir)/libfaac/libfaac.la -lm
-@WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
+@WITH_MP4V2_TRUE@LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
all: all-am
.SUFFIXES: