From 435a5d525c9aa9e4a4b174949b2d67d57110aa9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 27 Jan 2008 16:40:07 +0100 Subject: Move libmpeg2-based decoder building in video_dec. Avoid one recursive make call. --- configure.ac | 1 - src/video_dec/Makefile.am | 20 +++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ef55a27ee..743eb9468 100644 --- a/configure.ac +++ b/configure.ac @@ -1197,7 +1197,6 @@ src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/spu_dec/Makefile src/video_dec/Makefile -src/video_dec/libmpeg2/Makefile src/video_out/Makefile src/xine-utils/Makefile src/xine-engine/Makefile diff --git a/src/video_dec/Makefile.am b/src/video_dec/Makefile.am index 91246eb4d..1b0fec998 100644 --- a/src/video_dec/Makefile.am +++ b/src/video_dec/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = libmpeg2 - include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) @@ -20,7 +18,8 @@ xineplug_LTLIBRARIES = $(image_module) \ $(theora_module) \ xineplug_decode_bitplane.la \ xineplug_decode_rgb.la \ - xineplug_decode_yuv.la + xineplug_decode_yuv.la \ + xineplug_decode_mpeg2.la xineplug_decode_bitplane_la_SOURCES = bitplane.c xineplug_decode_bitplane_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) @@ -38,3 +37,18 @@ xineplug_decode_image_la_CFLAGS = $(AM_CFLAGS) $(WAND_CFLAGS) xineplug_decode_gdk_pixbuf_la_SOURCES = gdkpixbuf.c xineplug_decode_gdk_pixbuf_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(GDK_PIXBUF_LIBS) xineplug_decode_gdk_pixbuf_la_CFLAGS = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS) + +xineplug_decode_mpeg2_la_SOURCES = libmpeg2/cpu_state.c \ + libmpeg2/decode.c libmpeg2/header.c libmpeg2/idct.c \ + libmpeg2/idct_altivec.c libmpeg2/idct_mlib.c \ + libmpeg2/idct_mmx.c libmpeg2/motion_comp.c \ + libmpeg2/motion_comp_altivec.c libmpeg2/motion_comp_mmx.c \ + libmpeg2/motion_comp_mlib.c libmpeg2/motion_comp_vis.c \ + libmpeg2/slice.c libmpeg2/slice_xvmc.c \ + libmpeg2/slice_xvmc_vld.c libmpeg2/stats.c \ + libmpeg2/xine_mpeg2_decoder.c libmpeg2/libmpeg2_accel.c \ + libmpeg2/vlc.h libmpeg2/mpeg2.h libmpeg2/xvmc.h \ + libmpeg2/xvmc_vld.h libmpeg2/mpeg2_internal.h \ + libmpeg2/idct_mlib.h libmpeg2/vis.h libmpeg2/libmpeg2_accel.h +xineplug_decode_mpeg2_la_LIBADD = $(XINE_LIB) $(MLIB_LIBS) -lm +xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) -- cgit v1.2.3 From fdd31b7b130a36dbd1d59b075667626e592cac70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 27 Jan 2008 16:42:52 +0100 Subject: Remove makefile I should have removed before. --- src/video_dec/libmpeg2/Makefile.am | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/video_dec/libmpeg2/Makefile.am diff --git a/src/video_dec/libmpeg2/Makefile.am b/src/video_dec/libmpeg2/Makefile.am deleted file mode 100644 index 2f7429942..000000000 --- a/src/video_dec/libmpeg2/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -AM_LDFLAGS = $(xineplug_ldflags) - -noinst_HEADERS = vlc.h mpeg2.h xvmc.h xvmc_vld.h mpeg2_internal.h idct_mlib.h vis.h \ - libmpeg2_accel.h - -xineplug_LTLIBRARIES = xineplug_decode_mpeg2.la - -xineplug_decode_mpeg2_la_SOURCES = \ - cpu_state.c \ - decode.c \ - header.c \ - idct.c \ - idct_altivec.c \ - idct_mlib.c \ - idct_mmx.c \ - motion_comp.c \ - motion_comp_altivec.c \ - motion_comp_mmx.c \ - motion_comp_mlib.c \ - motion_comp_vis.c \ - slice.c \ - slice_xvmc.c \ - slice_xvmc_vld.c \ - stats.c \ - xine_mpeg2_decoder.c \ - libmpeg2_accel.c - -xineplug_decode_mpeg2_la_LIBADD = $(XINE_LIB) $(MLIB_LIBS) -lm -xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) -- cgit v1.2.3 From 83953bfe7440f1c99118da6716bc5f7b62013cfe Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 1 Feb 2008 00:57:19 +0000 Subject: Back out mpeg2 build changes: separate unit (though used only once). Also, built files don't end up in the lib directory. --- configure.ac | 1 + src/video_dec/Makefile.am | 20 +++----------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 743eb9468..ef55a27ee 100644 --- a/configure.ac +++ b/configure.ac @@ -1197,6 +1197,7 @@ src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile src/spu_dec/Makefile src/video_dec/Makefile +src/video_dec/libmpeg2/Makefile src/video_out/Makefile src/xine-utils/Makefile src/xine-engine/Makefile diff --git a/src/video_dec/Makefile.am b/src/video_dec/Makefile.am index 1b0fec998..91246eb4d 100644 --- a/src/video_dec/Makefile.am +++ b/src/video_dec/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = libmpeg2 + include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) @@ -18,8 +20,7 @@ xineplug_LTLIBRARIES = $(image_module) \ $(theora_module) \ xineplug_decode_bitplane.la \ xineplug_decode_rgb.la \ - xineplug_decode_yuv.la \ - xineplug_decode_mpeg2.la + xineplug_decode_yuv.la xineplug_decode_bitplane_la_SOURCES = bitplane.c xineplug_decode_bitplane_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) @@ -37,18 +38,3 @@ xineplug_decode_image_la_CFLAGS = $(AM_CFLAGS) $(WAND_CFLAGS) xineplug_decode_gdk_pixbuf_la_SOURCES = gdkpixbuf.c xineplug_decode_gdk_pixbuf_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(GDK_PIXBUF_LIBS) xineplug_decode_gdk_pixbuf_la_CFLAGS = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS) - -xineplug_decode_mpeg2_la_SOURCES = libmpeg2/cpu_state.c \ - libmpeg2/decode.c libmpeg2/header.c libmpeg2/idct.c \ - libmpeg2/idct_altivec.c libmpeg2/idct_mlib.c \ - libmpeg2/idct_mmx.c libmpeg2/motion_comp.c \ - libmpeg2/motion_comp_altivec.c libmpeg2/motion_comp_mmx.c \ - libmpeg2/motion_comp_mlib.c libmpeg2/motion_comp_vis.c \ - libmpeg2/slice.c libmpeg2/slice_xvmc.c \ - libmpeg2/slice_xvmc_vld.c libmpeg2/stats.c \ - libmpeg2/xine_mpeg2_decoder.c libmpeg2/libmpeg2_accel.c \ - libmpeg2/vlc.h libmpeg2/mpeg2.h libmpeg2/xvmc.h \ - libmpeg2/xvmc_vld.h libmpeg2/mpeg2_internal.h \ - libmpeg2/idct_mlib.h libmpeg2/vis.h libmpeg2/libmpeg2_accel.h -xineplug_decode_mpeg2_la_LIBADD = $(XINE_LIB) $(MLIB_LIBS) -lm -xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) -- cgit v1.2.3 From fabf7238464f5f4fd1d7dab99f4b7e6bb5d47a95 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 1 Feb 2008 00:57:32 +0000 Subject: Restore libmpeg2/Makefile.am. --- src/video_dec/libmpeg2/Makefile.am | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/video_dec/libmpeg2/Makefile.am diff --git a/src/video_dec/libmpeg2/Makefile.am b/src/video_dec/libmpeg2/Makefile.am new file mode 100644 index 000000000..2f7429942 --- /dev/null +++ b/src/video_dec/libmpeg2/Makefile.am @@ -0,0 +1,32 @@ +include $(top_srcdir)/misc/Makefile.common + +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_LDFLAGS = $(xineplug_ldflags) + +noinst_HEADERS = vlc.h mpeg2.h xvmc.h xvmc_vld.h mpeg2_internal.h idct_mlib.h vis.h \ + libmpeg2_accel.h + +xineplug_LTLIBRARIES = xineplug_decode_mpeg2.la + +xineplug_decode_mpeg2_la_SOURCES = \ + cpu_state.c \ + decode.c \ + header.c \ + idct.c \ + idct_altivec.c \ + idct_mlib.c \ + idct_mmx.c \ + motion_comp.c \ + motion_comp_altivec.c \ + motion_comp_mmx.c \ + motion_comp_mlib.c \ + motion_comp_vis.c \ + slice.c \ + slice_xvmc.c \ + slice_xvmc_vld.c \ + stats.c \ + xine_mpeg2_decoder.c \ + libmpeg2_accel.c + +xineplug_decode_mpeg2_la_LIBADD = $(XINE_LIB) $(MLIB_LIBS) -lm +xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) -- cgit v1.2.3