[packages/mpeg4ip] - renamed and added more removals
baggins
baggins at pld-linux.org
Tue Nov 13 14:33:35 CET 2012
commit 20654187075bd33163746facb2a71b080aca5ddd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Nov 13 14:27:43 2012 +0100
- renamed and added more removals
mpeg4ip-remove-mp4v2.patch | 8 --
mpeg4ip-system-mp4v2.patch | 261 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 261 insertions(+), 8 deletions(-)
---
diff --git a/mpeg4ip-remove-mp4v2.patch b/mpeg4ip-remove-mp4v2.patch
deleted file mode 100644
index 1b575d3..0000000
--- a/mpeg4ip-remove-mp4v2.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- mpeg4ip-1.6.1/lib/Makefile.am~ 2006-09-29 21:55:39.000000000 +0200
-+++ mpeg4ip-1.6.1/lib/Makefile.am 2012-11-13 13:02:07.730778548 +0100
-@@ -8,4 +8,4 @@
- endif
- endif
-
--SUBDIRS = utils audio avi ffmpeg fposrec gnu ismacryp mp4av mp4 mp4v2 msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir)
-+SUBDIRS = utils audio avi ffmpeg fposrec gnu ismacryp mp4av mp4 msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir)
diff --git a/mpeg4ip-system-mp4v2.patch b/mpeg4ip-system-mp4v2.patch
new file mode 100644
index 0000000..6cef491
--- /dev/null
+++ b/mpeg4ip-system-mp4v2.patch
@@ -0,0 +1,261 @@
+diff -ur mpeg4ip-1.6.1/configure.in mpeg4ip-1.6.1-system-mp4v2/configure.in
+--- mpeg4ip-1.6.1/configure.in 2012-11-13 13:55:08.198816022 +0100
++++ mpeg4ip-1.6.1-system-mp4v2/configure.in 2012-11-13 13:30:42.865534377 +0100
+@@ -910,7 +910,6 @@
+ doc/ietf/Makefile \
+ doc/mcast/Makefile \
+ doc/programs/Makefile \
+- doc/mp4v2/Makefile \
+ include/Makefile \
+ lib/Makefile \
+ lib/audio/Makefile \
+@@ -922,9 +921,6 @@
+ lib/ismacryp/Makefile \
+ lib/srtp/Makefile \
+ lib/mp4/doc/Makefile \
+- lib/mp4v2/Makefile \
+- lib/mp4v2/test/Makefile \
+- lib/mp4v2/util/Makefile \
+ lib/mp4av/Makefile \
+ lib/mpeg2ps/Makefile \
+ lib/mpeg2t/Makefile \
+diff -ur mpeg4ip-1.6.1/doc/Makefile.am mpeg4ip-1.6.1-system-mp4v2/doc/Makefile.am
+--- mpeg4ip-1.6.1/doc/Makefile.am 2004-05-18 00:06:05.000000000 +0200
++++ mpeg4ip-1.6.1-system-mp4v2/doc/Makefile.am 2012-11-13 13:54:48.655483376 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = ietf mcast programs mp4v2
++SUBDIRS = ietf mcast programs
+
+ EXTRA_DIST = \
+ Building_mpeg4ip_with_V4L2_support.html \
+diff -ur mpeg4ip-1.6.1/lib/Makefile.am mpeg4ip-1.6.1-system-mp4v2/lib/Makefile.am
+--- mpeg4ip-1.6.1/lib/Makefile.am 2006-09-29 21:55:39.000000000 +0200
++++ mpeg4ip-1.6.1-system-mp4v2/lib/Makefile.am 2012-11-13 13:30:42.865534377 +0100
+@@ -8,4 +8,4 @@
+ endif
+ endif
+
+-SUBDIRS = utils audio avi ffmpeg fposrec gnu ismacryp mp4av mp4 mp4v2 msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir)
++SUBDIRS = utils audio avi ffmpeg fposrec gnu ismacryp mp4av mp4 msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir)
+diff -ur mpeg4ip-1.6.1/lib/mp4av/Makefile.am mpeg4ip-1.6.1-system-mp4v2/lib/mp4av/Makefile.am
+--- mpeg4ip-1.6.1/lib/mp4av/Makefile.am 2012-11-13 13:55:08.185482687 +0100
++++ mpeg4ip-1.6.1-system-mp4v2/lib/mp4av/Makefile.am 2012-11-13 13:34:10.372193724 +0100
+@@ -48,10 +48,7 @@
+ rfcisma.cpp \
+ rfch264.cpp
+
+-libmp4av_la_LIBADD = $(top_builddir)/lib/mp4v2/libmp4v2.la
+-
+-$(top_builddir)/lib/mp4v2/libmp4v2.la:
+- $(MAKE) -C $(top_builddir)/lib/mp4v2 libmp4v2.la
++libmp4av_la_LIBADD = -lmp4v2
+
+ EXTRA_DIST = libmp4av.dsp mp4av.vcproj
+
+diff -ur mpeg4ip-1.6.1/lib/mpeg2ps/Makefile.am mpeg4ip-1.6.1-system-mp4v2/lib/mpeg2ps/Makefile.am
+--- mpeg4ip-1.6.1/lib/mpeg2ps/Makefile.am 2012-11-13 13:55:08.188816020 +0100
++++ mpeg4ip-1.6.1-system-mp4v2/lib/mpeg2ps/Makefile.am 2012-11-13 13:34:50.808858966 +0100
+@@ -15,7 +15,7 @@
+ libmpeg2_program.la \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la
++ -lmp4v2
+
+ mpeg_ps_info_SOURCES = ps_info.cpp
+ mpeg_ps_info_LDADD = $(prog_libadd)
+@@ -27,7 +27,7 @@
+ mpeg2ps_test_LDADD = libmpeg2_program.la \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la
++ -lmp4v2
+
+ EXTRA_DIST=libmpeg2ps.dsp libmpeg2ps.vcproj mpeg_ps_info.vcproj
+
+diff -ur mpeg4ip-1.6.1/lib/mpeg2t/Makefile.am mpeg4ip-1.6.1-system-mp4v2/lib/mpeg2t/Makefile.am
+--- mpeg4ip-1.6.1/lib/mpeg2t/Makefile.am 2007-01-30 22:53:42.000000000 +0100
++++ mpeg4ip-1.6.1-system-mp4v2/lib/mpeg2t/Makefile.am 2012-11-13 13:35:25.452191078 +0100
+@@ -21,21 +21,21 @@
+ mpeg2t_dump_LDADD = libmpeg2_transport.la \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
++ -lmp4v2 \
+ @SDL_LIBS@
+
+ mpeg2t_test_SOURCES = test.cpp
+ mpeg2t_test_LDADD = libmpeg2_transport.la \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
++ -lmp4v2 \
+ @SDL_LIBS@
+
+ mpeg2t_extract_SOURCES = mpeg2t_extract.cpp
+ mpeg2t_extract_LDADD = libmpeg2_transport.la \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
++ -lmp4v2 \
+ @SDL_LIBS@
+
+ EXTRA_DIST=
+diff -ur mpeg4ip-1.6.1/lib/srtp/Makefile.am mpeg4ip-1.6.1-system-mp4v2/lib/srtp/Makefile.am
+--- mpeg4ip-1.6.1/lib/srtp/Makefile.am 2012-11-13 13:55:08.188816020 +0100
++++ mpeg4ip-1.6.1-system-mp4v2/lib/srtp/Makefile.am 2012-11-13 13:35:59.645523204 +0100
+@@ -11,7 +11,7 @@
+ liblibsrtp.h
+ libsrtpif_la_LIBADD = @SRTPLIB@ \
+ @SDL_LIBS@ \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
++ -lmp4v2 \
+ $(top_builddir)/lib/utils/libmutex.la \
+ $(top_builddir)/lib/utils/libutils.la \
+ $(top_builddir)/lib/rtp/libuclmmbase.la
+@@ -21,9 +21,9 @@
+ check_PROGRAMS = test_srtp_client test_srtp_server
+
+ test_srtp_client_SOURCES = test_srtp_client.cpp
+-test_srtp_client_LDADD = ../rtp/libuclmmbase.la libsrtpif.la ../mp4v2/libmp4v2.la
++test_srtp_client_LDADD = ../rtp/libuclmmbase.la libsrtpif.la -lmp4v2
+
+ test_srtp_server_SOURCES = test_srtp_server.cpp
+-test_srtp_server_LDADD = ../rtp/libuclmmbase.la libsrtpif.la ../mp4v2/libmp4v2.la
++test_srtp_server_LDADD = ../rtp/libuclmmbase.la libsrtpif.la -lmp4v2
+
+ EXTRA_DIST=liblibstrp.vcproj
+diff -ur mpeg4ip-1.6.1/player/lib/mp4util/Makefile.am mpeg4ip-1.6.1-system-mp4v2/player/lib/mp4util/Makefile.am
+--- mpeg4ip-1.6.1/player/lib/mp4util/Makefile.am 2007-09-18 22:52:07.000000000 +0200
++++ mpeg4ip-1.6.1-system-mp4v2/player/lib/mp4util/Makefile.am 2012-11-13 13:36:24.408855664 +0100
+@@ -13,9 +13,9 @@
+ h264_sdp.c
+
+ libh264util_la_LIBADD = \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la
++ -lmp4v2
+
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4v2
+
+ AM_CFLAGS = -D_REENTRANT @BILLS_CWARNINGS@
+
+diff -ur mpeg4ip-1.6.1/player/plugin/audio/g711/Makefile.am mpeg4ip-1.6.1-system-mp4v2/player/plugin/audio/g711/Makefile.am
+--- mpeg4ip-1.6.1/player/plugin/audio/g711/Makefile.am 2005-08-22 22:18:26.000000000 +0200
++++ mpeg4ip-1.6.1-system-mp4v2/player/plugin/audio/g711/Makefile.am 2012-11-13 13:38:34.775517730 +0100
+@@ -6,10 +6,10 @@
+ ourg711.h ourg711.cpp
+ g711_audio_plugin_la_LIBADD = \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
++ -lmp4v2 \
+ -lm
+
+ INCLUDES = -I$(top_srcdir)/player/src -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/mp4av -I$(top_srcdir)/lib/mp4v2 -I$(top_srcdir)/lib/sdp
+
+ AM_CFLAGS = -D_REENTRANT -fexceptions @BILLS_CWARNINGS@
+
+diff -ur mpeg4ip-1.6.1/player/plugin/video/ffmpeg/Makefile.am mpeg4ip-1.6.1-system-mp4v2/player/plugin/video/ffmpeg/Makefile.am
+--- mpeg4ip-1.6.1/player/plugin/video/ffmpeg/Makefile.am 2007-01-22 18:31:17.000000000 +0100
++++ mpeg4ip-1.6.1-system-mp4v2/player/plugin/video/ffmpeg/Makefile.am 2012-11-13 13:39:35.615515585 +0100
+@@ -12,14 +12,12 @@
+ ffmpeg.cpp ffmpeg.h
+ ffmpeg_video_plugin_la_LIBADD = \
+ -lm \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
++ -lmp4v2 \
+ $(top_builddir)/player/lib/mp4util/libmp4util.la \
+ $(top_builddir)/lib/utils/libmutex.la \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
+ $(top_builddir)/player/lib/mp4util/libh264util.la \
+ $(top_builddir)/lib/ffmpeg/libmpeg4ip_ffmpeg.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
+ @FFMPEG_LIB@
+
+ INCLUDES = \
+diff -ur mpeg4ip-1.6.1/player/src/codec/aa/Makefile.am mpeg4ip-1.6.1-system-mp4v2/player/src/codec/aa/Makefile.am
+--- mpeg4ip-1.6.1/player/src/codec/aa/Makefile.am 2007-09-18 22:52:17.000000000 +0200
++++ mpeg4ip-1.6.1-system-mp4v2/player/src/codec/aa/Makefile.am 2012-11-13 13:36:49.705521439 +0100
+@@ -11,12 +11,12 @@
+ aac_plugin_la_LIBADD = \
+ $(top_builddir)/player/lib/audio/faad/libmpeg4ip_faad.la \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
++ -lmp4v2 \
+ $(top_builddir)/player/lib/mp4util/libmp4util.la \
+ -lm
+
+
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/sdp -I$(top_srcdir)/player/src -I$(top_srcdir)/player/lib/audio -I$(top_srcdir)/player/lib -I$(top_srcdir)/lib/mp4v2 -I$(top_srcdir)/lib/mp4av
+
+ AM_CFLAGS = -D_REENTRANT -fexceptions @BILLS_CWARNINGS@
+
+diff -ur mpeg4ip-1.6.1/player/src/Makefile.am mpeg4ip-1.6.1-system-mp4v2/player/src/Makefile.am
+--- mpeg4ip-1.6.1/player/src/Makefile.am 2012-11-13 13:55:08.188816020 +0100
++++ mpeg4ip-1.6.1-system-mp4v2/player/src/Makefile.am 2012-11-13 13:37:43.155519553 +0100
+@@ -187,7 +187,7 @@
+ $(top_builddir)/lib/utils/libmutex.la \
+ $(top_builddir)/player/lib/rtsp/librtsp.la \
+ $(top_builddir)/lib/mp4/libmp4.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
++ -lmp4v2 \
+ $(top_builddir)/lib/fposrec/libmpeg4ip_fposrec.la \
+ $(top_builddir)/lib/avi/libavi.la \
+ $(top_builddir)/lib/ismacryp/libismacryp.la \
+diff -ur mpeg4ip-1.6.1/server/mp4creator/Makefile.am mpeg4ip-1.6.1-system-mp4v2/server/mp4creator/Makefile.am
+--- mpeg4ip-1.6.1/server/mp4creator/Makefile.am 2012-11-13 13:55:08.188816020 +0100
++++ mpeg4ip-1.6.1-system-mp4v2/server/mp4creator/Makefile.am 2012-11-13 13:40:41.645513256 +0100
+@@ -26,7 +26,7 @@
+
+ mp4creator_LDADD = \
+ $(top_builddir)/lib/mpeg2ps/libmpeg2_program.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
++ -lmp4v2 \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+ $(top_builddir)/lib/avi/libavi.la \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+diff -ur mpeg4ip-1.6.1/server/mp4live/Makefile.am mpeg4ip-1.6.1-system-mp4v2/server/mp4live/Makefile.am
+--- mpeg4ip-1.6.1/server/mp4live/Makefile.am 2012-11-13 13:55:08.188816020 +0100
++++ mpeg4ip-1.6.1-system-mp4v2/server/mp4live/Makefile.am 2012-11-13 13:40:59.682179287 +0100
+@@ -161,7 +161,7 @@
+ libmp4live.la \
+ $(top_builddir)/lib/mpeg2ps/libmpeg2_program.la \
+ $(top_builddir)/lib/msg_queue/libmsg_queue.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la \
++ -lmp4v2 \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+ $(top_builddir)/lib/rtp/libuclmmbase.la \
+ $(top_builddir)/lib/utils/libmutex.la \
+diff -ur mpeg4ip-1.6.1/util/h264/Makefile.am mpeg4ip-1.6.1-system-mp4v2/util/h264/Makefile.am
+--- mpeg4ip-1.6.1/util/h264/Makefile.am 2007-09-18 22:52:21.000000000 +0200
++++ mpeg4ip-1.6.1-system-mp4v2/util/h264/Makefile.am 2012-11-13 13:41:45.815510993 +0100
+@@ -17,6 +17,6 @@
+ -lm \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la
++ -lmp4v2
+
+ EXTRA_DIST= h264_parse.dsp h264_parse.vcproj
+diff -ur mpeg4ip-1.6.1/util/mpeg2/Makefile.am mpeg4ip-1.6.1-system-mp4v2/util/mpeg2/Makefile.am
+--- mpeg4ip-1.6.1/util/mpeg2/Makefile.am 2005-08-22 22:18:28.000000000 +0200
++++ mpeg4ip-1.6.1-system-mp4v2/util/mpeg2/Makefile.am 2012-11-13 13:42:07.652176889 +0100
+@@ -13,6 +13,6 @@
+ mpeg2video_parse_LDADD = \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+ $(top_builddir)/lib/mp4av/libmp4av.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la
++ -lmp4v2
+
+ EXTRA_DIST=
+diff -ur mpeg4ip-1.6.1/util/mpeg4vol/Makefile.am mpeg4ip-1.6.1-system-mp4v2/util/mpeg4vol/Makefile.am
+--- mpeg4ip-1.6.1/util/mpeg4vol/Makefile.am 2005-10-04 00:24:04.000000000 +0200
++++ mpeg4ip-1.6.1-system-mp4v2/util/mpeg4vol/Makefile.am 2012-11-13 13:42:22.478843031 +0100
+@@ -12,6 +12,6 @@
+
+ mpeg4vol_LDADD = \
+ $(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
+- $(top_builddir)/lib/mp4v2/libmp4v2.la
++ -lmp4v2
+
+ EXTRA_DIST=mpeg4vol.dsp
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mpeg4ip.git/commitdiff/e16b98edf5fdc18b6c2c4e1496897fcf941c7fe0
More information about the pld-cvs-commit
mailing list