[vlc-devel] commit: Contrib: further fixes of Goom2k4 Makefiles (Jean-Baptiste Kempf )
git version control
git at videolan.org
Wed Aug 19 09:29:10 CEST 2009
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Aug 19 09:27:54 2009 +0200| [aab4d1cf25d4f970ea4d87428ffb1230c387e785] | committer: Jean-Baptiste Kempf
Contrib: further fixes of Goom2k4 Makefiles
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aab4d1cf25d4f970ea4d87428ffb1230c387e785
---
extras/contrib/src/Makefile | 11 +++--------
extras/contrib/src/Patches/goom.patch | 11 +++++++++++
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index c8e4389..c08482e 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1327,9 +1327,6 @@ goom$(GOOM2k4_VERSION).tar.gz:
goom: goom$(GOOM2k4_VERSION).tar.gz
$(EXTRACT_GZ)
-ifdef HAVE_DARWIN_OS
- patch -p0 < Patches/goom.patch
-endif
ifdef HAVE_WIN32
(cd $@; dos2unix configure.in)
patch -p0 < Patches/goom2k4-0-win32.patch
@@ -1337,13 +1334,11 @@ else
patch -p0 < Patches/goom2k4-0-mmx.patch
endif
patch -p0 < Patches/goom2k4-0-memleaks.patch
+ patch -p0 < Patches/goom.patch
+ (cd $@; rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf)
.goom2k4: goom
-ifdef HAVE_DARWIN_OS
- (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
-else
- (cd $< && rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
-endif
+ (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
touch $@
CLEAN_FILE += .goom2k4
diff --git a/extras/contrib/src/Patches/goom.patch b/extras/contrib/src/Patches/goom.patch
index 62efecc..335257d 100644
--- a/extras/contrib/src/Patches/goom.patch
+++ b/extras/contrib/src/Patches/goom.patch
@@ -12,3 +12,14 @@ diff -ru goom2k4-0/configure goom/configure
CCAS='$(CC)'
+--- goom/src/Makefile.am 2005-02-07 14:46:41.000000000 +0100
++++ goom.new/src/Makefile.am 2009-08-19 09:21:57.000000000 +0200
+@@ -16,7 +16,7 @@
+ goom2_libdir = $(libdir)
+
+ goom2_library_includedir=$(includedir)/goom
+-goom2_library_include_HEADERS = goom.h goom_plugin_info.h goom_typedefs.h goom_graphic.h goom_config_param.h goom_visual_fx.h goom_filters.h goom_tools.h goomsl.h goomsl_hash.h goomsl_heap.h goom_tools.h goom_config.h
++goom2_library_include_HEADERS = goom.h goom_plugin_info.h goom_typedefs.h goom_graphic.h goom_config_param.h goom_visual_fx.h goom_filters.h goom_tools.h goomsl.h goomsl_hash.h goomsl_heap.h goom_config.h
+ libgoom2_la_LDFLAGS = -export-dynamic -export-symbols-regex "goom.*"
+ libgoom2_la_SOURCES = \
+ goomsl_yacc.y goomsl_lex.l goomsl.c goomsl_hash.c goomsl_heap.c \
More information about the vlc-devel
mailing list