[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-302-g815855b |
|
Date: |
Tue, 19 Apr 2011 13:45:51 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 815855bc09fc2ddadf70b60a79b0a877da043560 (commit)
via c7db7bacc77e0e70de89ab5a129300d1e8902eb5 (commit)
via 2cde99868d849295b17c3e2ba100c556d4740dae (commit)
via 0c15c95c68c27b1abbbe974ee5deeaf51e11a03f (commit)
via 262348ccf7b10da92632b824067c58283ab040e7 (commit)
via 3ef494fedbeae5c41edf7bc3ffddcd25f18f8cf9 (commit)
via eeca73a6e741567ef381033978fe9d97d1c4ccf8 (commit)
via 748f8dfd6ac2cfa7d3a0296613f67090cf8c6b51 (commit)
via 002fcf0d43a7d8844b8432f84d8546cde1aa0ef2 (commit)
via 581b90f1d4452cdaade968071bff565817cc84e7 (commit)
via 9b4a4673d98bed3fde6c6a290085ed771a0c556e (commit)
via 1f13468479b35f240c4b7c843c570f64abbe851a (commit)
via ce42c221e28fef508a43f0f07a345ec55be001b8 (commit)
via fca7a99b29e2b723dc6e77f4291922b2dc90d0a8 (commit)
via f9779b4d6737b495162becef505f5fdaf92351fc (commit)
via 1d5e8ed9f5c606f82fac0c7ff6505edb08d7e31f (commit)
via 23185dee082e2206ab6ef5f47135891b97122227 (commit)
via 14fd995d6a81e335c249693f44a2912b08fa192f (commit)
via d3e8f6854af250b31a1522f017f12fed5c3b00f5 (commit)
via de743f6360ef6731db36edb07d52ef3a772d0224 (commit)
via f9c278c45a719bd7f291f692a1a58c0c485f5ed6 (commit)
via 09eb36cad0a3ec3ca6492ac136d782942c1f1829 (commit)
via c37db484ccea5cff8dec4c9bd34878462a31e0a9 (commit)
from 8206b4714302874fdc9204b019c8df18d0e335e0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=815855bc09fc2ddadf70b60a79b0a877da043560
commit 815855bc09fc2ddadf70b60a79b0a877da043560
Author: Andrew Guertin <address@hidden>
Date: Sun Apr 17 11:44:28 2011 -0400
Reordering
diff --git a/libsound/Makefile.am b/libsound/Makefile.am
index 0e129f3..43dcfaa 100644
--- a/libsound/Makefile.am
+++ b/libsound/Makefile.am
@@ -18,21 +18,6 @@ AUTOMAKE_OPTIONS = foreign
pkglib_LTLIBRARIES = libgnashsound.la
-libgnashsound_la_CPPFLAGS = \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libmedia \
- $(PTHREAD_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(SDL_CFLAGS) \
- $(NULL)
-
-libgnashsound_la_LIBADD = \
- $(top_builddir)/libmedia/libgnashmedia.la \
- $(top_builddir)/libbase/libgnashbase.la \
- $(BOOST_LIBS) \
- $(SDL_LIBS) \
- $(NULL)
-
libgnashsound_la_SOURCES = \
AuxStream.h \
EmbedSound.cpp \
@@ -47,10 +32,6 @@ libgnashsound_la_SOURCES = \
WAVWriter.h \
$(NULL)
-noinst_HEADERS = \
- NullSoundHandler.h \
- $(NULL)
-
if USE_SOUND_SDL
libgnashsound_la_SOURCES += \
sdl/sound_handler_sdl.cpp \
@@ -70,11 +51,29 @@ libgnashsound_la_SOURCES += \
mkit/sound_handler_mkit.cpp \
mkit/sound_handler_mkit.h \
$(NULL)
-libgnashsound_la_LIBADD += -lmedia
endif
-if ENABLE_PCH
-AM_CXXFLAGS = $(PCH_FLAGS)
+noinst_HEADERS = \
+ NullSoundHandler.h \
+ $(NULL)
+
+libgnashsound_la_CPPFLAGS = \
+ -I$(top_srcdir)/libbase \
+ -I$(top_srcdir)/libmedia \
+ $(PTHREAD_CFLAGS) \
+ $(BOOST_CFLAGS) \
+ $(SDL_CFLAGS) \
+ $(NULL)
+
+libgnashsound_la_LIBADD = \
+ $(top_builddir)/libmedia/libgnashmedia.la \
+ $(top_builddir)/libbase/libgnashbase.la \
+ $(BOOST_LIBS) \
+ $(SDL_LIBS) \
+ $(NULL)
+
+if USE_SOUND_MKIT
+libgnashsound_la_LIBADD += -lmedia
endif
libgnashsound_la_LDFLAGS = -release $(VERSION)
@@ -84,6 +83,10 @@ libgnashsound_la_LDFLAGS += -no-undefined
libgnashsound_la_LIBADD += -lintl
endif
+if ENABLE_PCH
+AM_CXXFLAGS = $(PCH_FLAGS)
+endif
+
# Remove libtool .la files
install-exec-hook:
$(RM) $(DESTDIR)$(libdir)/gnash/libgnashsound.la
http://git.savannah.gnu.org/cgit//commit/?id=c7db7bacc77e0e70de89ab5a129300d1e8902eb5
commit c7db7bacc77e0e70de89ab5a129300d1e8902eb5
Author: Andrew Guertin <address@hidden>
Date: Sun Apr 17 11:41:18 2011 -0400
Move headers into _SOURCES in libsound/Makefile.am
NullSoundHandler.h is not used by anything in libsound, but it is used
by things outside of libsound. Therefore, it stays in noinst_HEADERS.
diff --git a/libsound/Makefile.am b/libsound/Makefile.am
index a9a44c0..0e129f3 100644
--- a/libsound/Makefile.am
+++ b/libsound/Makefile.am
@@ -34,37 +34,43 @@ libgnashsound_la_LIBADD = \
$(NULL)
libgnashsound_la_SOURCES = \
- sound_handler.cpp \
+ AuxStream.h \
EmbedSound.cpp \
+ EmbedSound.h \
EmbedSoundInst.cpp \
+ EmbedSoundInst.h \
+ InputStream.h \
+ sound_handler.cpp \
+ sound_handler.h \
+ SoundEnvelope.h \
WAVWriter.cpp \
+ WAVWriter.h \
$(NULL)
noinst_HEADERS = \
NullSoundHandler.h \
- sound_handler.h \
- SoundEnvelope.h \
- InputStream.h \
- EmbedSound.h \
- EmbedSoundInst.h \
- AuxStream.h \
- WAVWriter.h \
$(NULL)
if USE_SOUND_SDL
-libgnashsound_la_SOURCES += sdl/sound_handler_sdl.cpp
-noinst_HEADERS += sdl/sound_handler_sdl.h
+libgnashsound_la_SOURCES += \
+ sdl/sound_handler_sdl.cpp \
+ sdl/sound_handler_sdl.h \
+ $(NULL)
endif
if USE_SOUND_AHI
-libgnashsound_la_SOURCES += aos4/sound_handler_ahi.cpp
-noinst_HEADERS += aos4/sound_handler_ahi.h
+libgnashsound_la_SOURCES += \
+ aos4/sound_handler_ahi.cpp \
+ aos4/sound_handler_ahi.h \
+ $(NULL)
endif
if USE_SOUND_MKIT
-libgnashsound_la_SOURCES += mkit/sound_handler_mkit.cpp
+libgnashsound_la_SOURCES += \
+ mkit/sound_handler_mkit.cpp \
+ mkit/sound_handler_mkit.h \
+ $(NULL)
libgnashsound_la_LIBADD += -lmedia
-noinst_HEADERS += mkit/sound_handler_mkit.h
endif
if ENABLE_PCH
http://git.savannah.gnu.org/cgit//commit/?id=2cde99868d849295b17c3e2ba100c556d4740dae
commit 2cde99868d849295b17c3e2ba100c556d4740dae
Author: Andrew Guertin <address@hidden>
Date: Sun Apr 17 11:31:15 2011 -0400
Whitespace, no-op
diff --git a/libsound/Makefile.am b/libsound/Makefile.am
index 4fae6cf..a9a44c0 100644
--- a/libsound/Makefile.am
+++ b/libsound/Makefile.am
@@ -16,9 +16,7 @@
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST =
-
-pkglib_LTLIBRARIES = libgnashsound.la
+pkglib_LTLIBRARIES = libgnashsound.la
libgnashsound_la_CPPFLAGS = \
-I$(top_srcdir)/libbase \
@@ -54,18 +52,19 @@ noinst_HEADERS = \
$(NULL)
if USE_SOUND_SDL
- libgnashsound_la_SOURCES += sdl/sound_handler_sdl.cpp
- noinst_HEADERS += sdl/sound_handler_sdl.h
+libgnashsound_la_SOURCES += sdl/sound_handler_sdl.cpp
+noinst_HEADERS += sdl/sound_handler_sdl.h
endif
+
if USE_SOUND_AHI
- libgnashsound_la_SOURCES += aos4/sound_handler_ahi.cpp
- noinst_HEADERS += aos4/sound_handler_ahi.h
+libgnashsound_la_SOURCES += aos4/sound_handler_ahi.cpp
+noinst_HEADERS += aos4/sound_handler_ahi.h
endif
if USE_SOUND_MKIT
- libgnashsound_la_SOURCES += mkit/sound_handler_mkit.cpp
- libgnashsound_la_LIBADD += -lmedia
- noinst_HEADERS += mkit/sound_handler_mkit.h
+libgnashsound_la_SOURCES += mkit/sound_handler_mkit.cpp
+libgnashsound_la_LIBADD += -lmedia
+noinst_HEADERS += mkit/sound_handler_mkit.h
endif
if ENABLE_PCH
@@ -75,9 +74,8 @@ endif
libgnashsound_la_LDFLAGS = -release $(VERSION)
if WIN32
- libgnashsound_la_LDFLAGS += -no-undefined
- libgnashsound_la_LIBADD += \
- -lintl
+libgnashsound_la_LDFLAGS += -no-undefined
+libgnashsound_la_LIBADD += -lintl
endif
# Remove libtool .la files
http://git.savannah.gnu.org/cgit//commit/?id=0c15c95c68c27b1abbbe974ee5deeaf51e11a03f
commit 0c15c95c68c27b1abbbe974ee5deeaf51e11a03f
Author: Andrew Guertin <address@hidden>
Date: Sat Apr 16 22:25:04 2011 -0400
Remove no-op
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index 1250505..a814631 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -145,11 +145,6 @@ libgnashmedia_la_CPPFLAGS += \
$(NULL)
endif
-if USE_HAIKU_ENGINE
-libgnashmedia_la_CPPFLAGS += \
- $(NULL)
-endif
-
if HAVE_SPEEX
libgnashmedia_la_CPPFLAGS += \
$(SPEEX_CFLAGS) \
http://git.savannah.gnu.org/cgit//commit/?id=262348ccf7b10da92632b824067c58283ab040e7
commit 262348ccf7b10da92632b824067c58283ab040e7
Author: Andrew Guertin <address@hidden>
Date: Sat Apr 16 22:19:34 2011 -0400
-lgstbase-10 is already included in GSTREAMER_APP_LIBS
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index 5d26b16..1250505 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -170,7 +170,6 @@ libgnashmedia_la_LIBADD = \
if USE_GST_ENGINE
libgnashmedia_la_LIBADD += \
- -lgstbase-0.10 \
$(GSTREAMER_APP_LIBS) \
$(GSTREAMER_PBUTILS_LIBS) \
$(GSTREAMER_PLUGINS_BASE_LIBS) \
http://git.savannah.gnu.org/cgit//commit/?id=3ef494fedbeae5c41edf7bc3ffddcd25f18f8cf9
commit 3ef494fedbeae5c41edf7bc3ffddcd25f18f8cf9
Author: Andrew Guertin <address@hidden>
Date: Sat Apr 16 22:18:56 2011 -0400
Remove unnecessary gst include flag
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index e948492..5d26b16 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -133,7 +133,6 @@ endif
if USE_GST_ENGINE
libgnashmedia_la_CPPFLAGS += \
- -I$(top_srcdir)/libmedia/gst \
$(GSTREAMER_CFLAGS) \
$(GSTAPP_CFLAGS) \
$(GSTREAMER_PBUTILS_CFLAGS) \
http://git.savannah.gnu.org/cgit//commit/?id=eeca73a6e741567ef381033978fe9d97d1c4ccf8
commit eeca73a6e741567ef381033978fe9d97d1c4ccf8
Author: Andrew Guertin <address@hidden>
Date: Sat Apr 16 22:03:52 2011 -0400
Only add vaapi CPPFLAGS if HAVE_VAAPI in libmedia/Makefile.am
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index 732785a..e948492 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -158,9 +158,11 @@ libgnashmedia_la_CPPFLAGS += \
$(NULL)
endif
+if HAVE_VAAPI
libgnashmedia_la_CPPFLAGS += \
-I$(top_srcdir)/libvaapi \
$(NULL)
+endif
libgnashmedia_la_LIBADD = \
$(top_builddir)/libbase/libgnashbase.la \
http://git.savannah.gnu.org/cgit//commit/?id=748f8dfd6ac2cfa7d3a0296613f67090cf8c6b51
commit 748f8dfd6ac2cfa7d3a0296613f67090cf8c6b51
Author: Andrew Guertin <address@hidden>
Date: Sat Apr 16 22:02:08 2011 -0400
Group setting of each variable in libmedia Makefile.am
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index f945a15..732785a 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -22,21 +22,6 @@ AM_CXXFLAGS = -DREGISTER_MEDIA_HANDLERS
# before libgnash, as libgnash depends on it for extensions.
pkglib_LTLIBRARIES = libgnashmedia.la
-libgnashmedia_la_CPPFLAGS = \
- -I$(top_srcdir)/libbase \
- $(PTHREAD_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(NULL)
-
-if ANDROID
-libgnashmedia_la_CPPFLAGS += $(ANDROID_NDK)/usr/include
-endif
-
-libgnashmedia_la_LIBADD = \
- $(top_builddir)/libbase/libgnashbase.la \
- $(BOOST_LIBS) \
- $(NULL)
-
libgnashmedia_la_SOURCES = \
AudioDecoder.h \
AudioDecoderSimple.cpp \
@@ -75,22 +60,6 @@ libgnashmedia_la_SOURCES += \
gst/VideoInputGst.cpp \
gst/VideoInputGst.h \
$(NULL)
-
-libgnashmedia_la_CPPFLAGS += \
- -I$(top_srcdir)/libmedia/gst \
- $(GSTREAMER_CFLAGS) \
- $(GSTAPP_CFLAGS) \
- $(GSTREAMER_PBUTILS_CFLAGS) \
- $(NULL)
-
-libgnashmedia_la_LIBADD += \
- -lgstbase-0.10 \
- $(GSTREAMER_APP_LIBS) \
- $(GSTREAMER_PBUTILS_LIBS) \
- $(GSTREAMER_PLUGINS_BASE_LIBS) \
- $(GSTREAMER_LIBS) \
- $(NULL)
-
endif
if USE_FFMPEG_ENGINE
@@ -117,20 +86,11 @@ libgnashmedia_la_SOURCES += \
VideoInput.h \
$(NULL)
-libgnashmedia_la_LIBADD += \
- $(FFMPEG_LIBS) \
- $(NULL)
-
-libgnashmedia_la_CPPFLAGS += \
- $(FFMPEG_CFLAGS) \
- $(NULL)
-
if HAVE_VAAPI
libgnashmedia_la_SOURCES += \
ffmpeg/VideoDecoderFfmpegVaapi.cpp \
ffmpeg/VideoDecoderFfmpegVaapi.h \
$(NULL)
-
endif
endif
@@ -152,46 +112,101 @@ libgnashmedia_la_SOURCES += \
haiku/VideoInputHaiku.cpp \
haiku/VideoInputHaiku.h \
$(NULL)
+endif
-libgnashmedia_la_LIBADD += \
- -lmedia \
+if HAVE_SPEEX
+libgnashmedia_la_SOURCES += \
+ AudioDecoderSpeex.cpp \
+ AudioDecoderSpeex.h \
+ $(NULL)
+endif
+
+libgnashmedia_la_CPPFLAGS = \
+ -I$(top_srcdir)/libbase \
+ $(PTHREAD_CFLAGS) \
+ $(BOOST_CFLAGS) \
$(NULL)
+if ANDROID
+libgnashmedia_la_CPPFLAGS += $(ANDROID_NDK)/usr/include
+endif
+
+if USE_GST_ENGINE
libgnashmedia_la_CPPFLAGS += \
+ -I$(top_srcdir)/libmedia/gst \
+ $(GSTREAMER_CFLAGS) \
+ $(GSTAPP_CFLAGS) \
+ $(GSTREAMER_PBUTILS_CFLAGS) \
$(NULL)
endif
-if HAVE_SPEEX
-libgnashmedia_la_LIBADD += \
- $(SPEEX_LIBS) \
- $(SPEEXDSP_LIBS) \
+if USE_FFMPEG_ENGINE
+libgnashmedia_la_CPPFLAGS += \
+ $(FFMPEG_CFLAGS) \
$(NULL)
+endif
+
+if USE_HAIKU_ENGINE
+libgnashmedia_la_CPPFLAGS += \
+ $(NULL)
+endif
+
+if HAVE_SPEEX
libgnashmedia_la_CPPFLAGS += \
$(SPEEX_CFLAGS) \
$(SPEEXDSP_CFLAGS) \
$(NULL)
-libgnashmedia_la_SOURCES += \
- AudioDecoderSpeex.cpp \
- AudioDecoderSpeex.h \
- $(NULL)
endif
-libgnashmedia_la_LDFLAGS = -release $(VERSION)
-
libgnashmedia_la_CPPFLAGS += \
-I$(top_srcdir)/libvaapi \
$(NULL)
+libgnashmedia_la_LIBADD = \
+ $(top_builddir)/libbase/libgnashbase.la \
+ $(BOOST_LIBS) \
+ $(NULL)
+
+if USE_GST_ENGINE
+libgnashmedia_la_LIBADD += \
+ -lgstbase-0.10 \
+ $(GSTREAMER_APP_LIBS) \
+ $(GSTREAMER_PBUTILS_LIBS) \
+ $(GSTREAMER_PLUGINS_BASE_LIBS) \
+ $(GSTREAMER_LIBS) \
+ $(NULL)
+endif
+
+if USE_FFMPEG_ENGINE
+libgnashmedia_la_LIBADD += \
+ $(FFMPEG_LIBS) \
+ $(NULL)
+endif
+
+if USE_HAIKU_ENGINE
+libgnashmedia_la_LIBADD += \
+ -lmedia \
+ $(NULL)
+endif
+
+if HAVE_SPEEX
+libgnashmedia_la_LIBADD += \
+ $(SPEEX_LIBS) \
+ $(SPEEXDSP_LIBS) \
+ $(NULL)
+endif
+
if HAVE_VAAPI
libgnashmedia_la_LIBADD += \
$(top_builddir)/libvaapi/libgnashvaapi.la \
$(NULL)
endif
+libgnashmedia_la_LDFLAGS = -release $(VERSION)
+
if WIN32
libgnashmedia_la_LDFLAGS += -no-undefined
-libgnashmedia_la_LIBADD += \
- -lintl
+libgnashmedia_la_LIBADD += -lintl
endif
if ENABLE_PCH
http://git.savannah.gnu.org/cgit//commit/?id=002fcf0d43a7d8844b8432f84d8546cde1aa0ef2
commit 002fcf0d43a7d8844b8432f84d8546cde1aa0ef2
Author: Andrew Guertin <address@hidden>
Date: Sat Apr 16 21:44:00 2011 -0400
Whitespace
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index 9104380..f945a15 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -20,7 +20,7 @@ AM_CXXFLAGS = -DREGISTER_MEDIA_HANDLERS
# If we are using an installable libltdl, then it needs to be built
# before libgnash, as libgnash depends on it for extensions.
-pkglib_LTLIBRARIES = libgnashmedia.la
+pkglib_LTLIBRARIES = libgnashmedia.la
libgnashmedia_la_CPPFLAGS = \
-I$(top_srcdir)/libbase \
@@ -29,7 +29,7 @@ libgnashmedia_la_CPPFLAGS = \
$(NULL)
if ANDROID
- libgnashmedia_la_CPPFLAGS += $(ANDROID_NDK)/usr/include
+libgnashmedia_la_CPPFLAGS += $(ANDROID_NDK)/usr/include
endif
libgnashmedia_la_LIBADD = \
@@ -54,7 +54,7 @@ libgnashmedia_la_SOURCES = \
$(NULL)
if USE_GST_ENGINE
- libgnashmedia_la_SOURCES += \
+libgnashmedia_la_SOURCES += \
AudioInput.h \
gst/AudioDecoderGst.cpp \
gst/AudioDecoderGst.h \
@@ -76,14 +76,14 @@ if USE_GST_ENGINE
gst/VideoInputGst.h \
$(NULL)
- libgnashmedia_la_CPPFLAGS += \
+libgnashmedia_la_CPPFLAGS += \
-I$(top_srcdir)/libmedia/gst \
$(GSTREAMER_CFLAGS) \
$(GSTAPP_CFLAGS) \
$(GSTREAMER_PBUTILS_CFLAGS) \
$(NULL)
- libgnashmedia_la_LIBADD += \
+libgnashmedia_la_LIBADD += \
-lgstbase-0.10 \
$(GSTREAMER_APP_LIBS) \
$(GSTREAMER_PBUTILS_LIBS) \
@@ -94,7 +94,7 @@ if USE_GST_ENGINE
endif
if USE_FFMPEG_ENGINE
- libgnashmedia_la_SOURCES += \
+libgnashmedia_la_SOURCES += \
AudioInput.h \
ffmpeg/AudioDecoderFfmpeg.cpp \
ffmpeg/AudioDecoderFfmpeg.h \
@@ -117,25 +117,25 @@ if USE_FFMPEG_ENGINE
VideoInput.h \
$(NULL)
- libgnashmedia_la_LIBADD += \
+libgnashmedia_la_LIBADD += \
$(FFMPEG_LIBS) \
$(NULL)
- libgnashmedia_la_CPPFLAGS += \
+libgnashmedia_la_CPPFLAGS += \
$(FFMPEG_CFLAGS) \
$(NULL)
if HAVE_VAAPI
- libgnashmedia_la_SOURCES += \
- ffmpeg/VideoDecoderFfmpegVaapi.cpp \
- ffmpeg/VideoDecoderFfmpegVaapi.h \
- $(NULL)
+libgnashmedia_la_SOURCES += \
+ ffmpeg/VideoDecoderFfmpegVaapi.cpp \
+ ffmpeg/VideoDecoderFfmpegVaapi.h \
+ $(NULL)
endif
endif
if USE_HAIKU_ENGINE
- libgnashmedia_la_SOURCES += \
+libgnashmedia_la_SOURCES += \
haiku/adipe.h \
haiku/AudioDecoderHaiku.cpp \
haiku/AudioDecoderHaiku.h \
@@ -153,24 +153,24 @@ if USE_HAIKU_ENGINE
haiku/VideoInputHaiku.h \
$(NULL)
- libgnashmedia_la_LIBADD += \
+libgnashmedia_la_LIBADD += \
-lmedia \
$(NULL)
- libgnashmedia_la_CPPFLAGS += \
+libgnashmedia_la_CPPFLAGS += \
$(NULL)
endif
if HAVE_SPEEX
- libgnashmedia_la_LIBADD += \
+libgnashmedia_la_LIBADD += \
$(SPEEX_LIBS) \
$(SPEEXDSP_LIBS) \
$(NULL)
- libgnashmedia_la_CPPFLAGS += \
+libgnashmedia_la_CPPFLAGS += \
$(SPEEX_CFLAGS) \
$(SPEEXDSP_CFLAGS) \
$(NULL)
- libgnashmedia_la_SOURCES += \
+libgnashmedia_la_SOURCES += \
AudioDecoderSpeex.cpp \
AudioDecoderSpeex.h \
$(NULL)
@@ -178,19 +178,19 @@ endif
libgnashmedia_la_LDFLAGS = -release $(VERSION)
- libgnashmedia_la_CPPFLAGS += \
+libgnashmedia_la_CPPFLAGS += \
-I$(top_srcdir)/libvaapi \
$(NULL)
if HAVE_VAAPI
- libgnashmedia_la_LIBADD += \
+libgnashmedia_la_LIBADD += \
$(top_builddir)/libvaapi/libgnashvaapi.la \
$(NULL)
endif
if WIN32
- libgnashmedia_la_LDFLAGS += -no-undefined
- libgnashmedia_la_LIBADD += \
+libgnashmedia_la_LDFLAGS += -no-undefined
+libgnashmedia_la_LIBADD += \
-lintl
endif
http://git.savannah.gnu.org/cgit//commit/?id=581b90f1d4452cdaade968071bff565817cc84e7
commit 581b90f1d4452cdaade968071bff565817cc84e7
Author: Andrew Guertin <address@hidden>
Date: Sat Apr 16 09:17:51 2011 -0400
Haiku uses adipe.h, so list it
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index c93d01f..9104380 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -136,6 +136,7 @@ endif
if USE_HAIKU_ENGINE
libgnashmedia_la_SOURCES += \
+ haiku/adipe.h \
haiku/AudioDecoderHaiku.cpp \
haiku/AudioDecoderHaiku.h \
haiku/AudioInputHaiku.cpp \
http://git.savannah.gnu.org/cgit//commit/?id=9b4a4673d98bed3fde6c6a290085ed771a0c556e
commit 9b4a4673d98bed3fde6c6a290085ed771a0c556e
Author: Andrew Guertin <address@hidden>
Date: Sat Apr 16 09:16:31 2011 -0400
Remove reference to unused gnash_gst_version.h
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index 610da83..c93d01f 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -76,10 +76,6 @@ if USE_GST_ENGINE
gst/VideoInputGst.h \
$(NULL)
- noinst_HEADERS += \
- gst/gnash_gst_version.h \
- $(NULL)
-
libgnashmedia_la_CPPFLAGS += \
-I$(top_srcdir)/libmedia/gst \
$(GSTREAMER_CFLAGS) \
http://git.savannah.gnu.org/cgit//commit/?id=1f13468479b35f240c4b7c843c570f64abbe851a
commit 1f13468479b35f240c4b7c843c570f64abbe851a
Author: Andrew Guertin <address@hidden>
Date: Sat Apr 16 09:14:34 2011 -0400
Add headers to _SOURCES in libmedia
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index 4097f3c..610da83 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -38,51 +38,46 @@ libgnashmedia_la_LIBADD = \
$(NULL)
libgnashmedia_la_SOURCES = \
- MediaHandler.cpp \
+ AudioDecoder.h \
AudioDecoderSimple.cpp \
- MediaParser.cpp \
- FLVParser.cpp \
+ AudioDecoderSimple.h \
AudioResampler.cpp \
- $(NULL)
-
-noinst_HEADERS = \
- AudioDecoder.h \
- VideoDecoder.h \
- VideoConverter.h \
- MediaParser.h \
- MediaHandler.h \
+ AudioResampler.h \
+ FLVParser.cpp \
FLVParser.h \
- AudioDecoderSimple.h \
+ MediaHandler.cpp \
+ MediaHandler.h \
+ MediaParser.cpp \
+ MediaParser.h \
SoundInfo.h \
- AudioResampler.h \
- AudioInput.h \
- VideoInput.h \
+ VideoConverter.h \
$(NULL)
if USE_GST_ENGINE
libgnashmedia_la_SOURCES += \
- gst/MediaHandlerGst.cpp \
- gst/VideoDecoderGst.cpp \
+ AudioInput.h \
gst/AudioDecoderGst.cpp \
- gst/MediaParserGst.cpp \
- gst/VideoConverterGst.cpp \
+ gst/AudioDecoderGst.h \
+ gst/AudioInputGst.cpp \
+ gst/AudioInputGst.h \
gst/GstUtil.cpp \
+ gst/GstUtil.h \
+ gst/MediaHandlerGst.cpp \
+ gst/MediaHandlerGst.h \
+ gst/MediaParserGst.cpp \
+ gst/MediaParserGst.h \
gst/swfdec_codec_gst.c \
+ gst/swfdec_codec_gst.h \
+ gst/VideoConverterGst.cpp \
+ gst/VideoConverterGst.h \
+ gst/VideoDecoderGst.cpp \
+ gst/VideoDecoderGst.h \
gst/VideoInputGst.cpp \
- gst/AudioInputGst.cpp \
+ gst/VideoInputGst.h \
$(NULL)
noinst_HEADERS += \
- gst/MediaHandlerGst.h \
- gst/AudioDecoderGst.h \
- gst/VideoDecoderGst.h \
- gst/MediaParserGst.h \
- gst/VideoConverterGst.h \
- gst/GstUtil.h \
- gst/swfdec_codec_gst.h \
gst/gnash_gst_version.h \
- gst/VideoInputGst.h \
- gst/AudioInputGst.h \
$(NULL)
libgnashmedia_la_CPPFLAGS += \
@@ -104,26 +99,26 @@ endif
if USE_FFMPEG_ENGINE
libgnashmedia_la_SOURCES += \
- ffmpeg/MediaHandlerFfmpeg.cpp \
- ffmpeg/MediaParserFfmpeg.cpp \
+ AudioInput.h \
ffmpeg/AudioDecoderFfmpeg.cpp \
- ffmpeg/VideoDecoderFfmpeg.cpp \
- ffmpeg/AudioResamplerFfmpeg.cpp \
- ffmpeg/VideoConverterFfmpeg.cpp \
- ffmpeg/VideoInputFfmpeg.cpp \
- ffmpeg/AudioInputFfmpeg.cpp \
- $(NULL)
-
- noinst_HEADERS += \
- ffmpeg/MediaHandlerFfmpeg.h \
- ffmpeg/MediaParserFfmpeg.h \
ffmpeg/AudioDecoderFfmpeg.h \
- ffmpeg/VideoDecoderFfmpeg.h \
+ ffmpeg/AudioInputFfmpeg.cpp \
+ ffmpeg/AudioInputFfmpeg.h \
+ ffmpeg/AudioResamplerFfmpeg.cpp \
ffmpeg/AudioResamplerFfmpeg.h \
ffmpeg/ffmpegHeaders.h \
+ ffmpeg/MediaHandlerFfmpeg.cpp \
+ ffmpeg/MediaHandlerFfmpeg.h \
+ ffmpeg/MediaParserFfmpeg.cpp \
+ ffmpeg/MediaParserFfmpeg.h \
+ ffmpeg/VideoConverterFfmpeg.cpp \
ffmpeg/VideoConverterFfmpeg.h \
+ ffmpeg/VideoDecoderFfmpeg.cpp \
+ ffmpeg/VideoDecoderFfmpeg.h \
+ ffmpeg/VideoInputFfmpeg.cpp \
ffmpeg/VideoInputFfmpeg.h \
- ffmpeg/AudioInputFfmpeg.h \
+ VideoDecoder.h \
+ VideoInput.h \
$(NULL)
libgnashmedia_la_LIBADD += \
@@ -137,33 +132,28 @@ if USE_FFMPEG_ENGINE
if HAVE_VAAPI
libgnashmedia_la_SOURCES += \
ffmpeg/VideoDecoderFfmpegVaapi.cpp \
- $(NULL)
-
- noinst_HEADERS += \
ffmpeg/VideoDecoderFfmpegVaapi.h \
$(NULL)
+
endif
endif
if USE_HAIKU_ENGINE
libgnashmedia_la_SOURCES += \
- haiku/MediaHandlerHaiku.cpp \
- haiku/MediaParserHaiku.cpp \
haiku/AudioDecoderHaiku.cpp \
- haiku/VideoDecoderHaiku.cpp \
- haiku/VideoConverterHaiku.cpp \
- haiku/VideoInputHaiku.cpp \
+ haiku/AudioDecoderHaiku.h \
haiku/AudioInputHaiku.cpp \
- $(NULL)
-
- noinst_HEADERS += \
+ haiku/AudioInputHaiku.h \
+ haiku/MediaHandlerHaiku.cpp \
haiku/MediaHandlerHaiku.h \
+ haiku/MediaParserHaiku.cpp \
haiku/MediaParserHaiku.h \
- haiku/AudioDecoderHaiku.h \
- haiku/VideoDecoderHaiku.h \
+ haiku/VideoConverterHaiku.cpp \
haiku/VideoConverterHaiku.h \
+ haiku/VideoDecoderHaiku.cpp \
+ haiku/VideoDecoderHaiku.h \
+ haiku/VideoInputHaiku.cpp \
haiku/VideoInputHaiku.h \
- haiku/AudioInputHaiku.h \
$(NULL)
libgnashmedia_la_LIBADD += \
@@ -183,8 +173,10 @@ if HAVE_SPEEX
$(SPEEX_CFLAGS) \
$(SPEEXDSP_CFLAGS) \
$(NULL)
- libgnashmedia_la_SOURCES += AudioDecoderSpeex.cpp
- noinst_HEADERS += AudioDecoderSpeex.h
+ libgnashmedia_la_SOURCES += \
+ AudioDecoderSpeex.cpp \
+ AudioDecoderSpeex.h \
+ $(NULL)
endif
libgnashmedia_la_LDFLAGS = -release $(VERSION)
http://git.savannah.gnu.org/cgit//commit/?id=ce42c221e28fef508a43f0f07a345ec55be001b8
commit ce42c221e28fef508a43f0f07a345ec55be001b8
Author: Andrew Guertin <address@hidden>
Date: Sat Apr 16 07:10:17 2011 -0400
Remove dead code
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index a8d5801..4097f3c 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -16,11 +16,6 @@
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST =
-
-# this is where Gnash plugins get installed
-pluginsdir = $(prefix)/lib/gnash/plugins
-
AM_CXXFLAGS = -DREGISTER_MEDIA_HANDLERS
# If we are using an installable libltdl, then it needs to be built
http://git.savannah.gnu.org/cgit//commit/?id=fca7a99b29e2b723dc6e77f4291922b2dc90d0a8
commit fca7a99b29e2b723dc6e77f4291922b2dc90d0a8
Author: Andrew Guertin <address@hidden>
Date: Wed Apr 13 06:04:29 2011 -0400
List headers in _SOURCES
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index a185e87..8f7ea8e 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -22,35 +22,83 @@ EXTRA_DIST = gnashrc.in gnashpluginrc.in
libgnashbase_la_SOURCES = \
AMF.cpp \
+ AMF.h \
arg_parser.cpp \
+ arg_parser.h \
BitsReader.cpp \
+ BitsReader.h \
ClockTime.cpp \
+ ClockTime.h \
curl_adapter.cpp \
+ dsodefs.h \
GC.cpp \
+ GC.h \
+ getclocktime.hpp \
+ gettext.h \
+ gmemory.h \
+ GnashAlgorithm.h \
+ GnashEnums.h \
+ GnashException.h \
GnashFileUtilities.cpp \
+ GnashFileUtilities.h \
GnashImage.cpp \
+ GnashImage.h \
GnashImageJpeg.cpp \
+ GnashImageJpeg.h \
+ GnashNumeric.h \
+ GnashSleep.h \
+ GnashSystemFDHeaders.h \
+ GnashSystemIOHeaders.h \
+ GnashSystemNetHeaders.h \
IOChannel.cpp \
+ IOChannel.h \
log.cpp \
+ log.h \
memory.cpp \
NamingPolicy.cpp \
+ NamingPolicy.h \
+ NetworkAdapter.h \
noseek_fd_adapter.cpp \
+ noseek_fd_adapter.h \
rc.cpp \
+ rc.h \
RTMP.cpp \
+ RTMP.h \
+ SharedMem.h \
+ SimpleBuffer.h \
Socket.cpp \
+ Socket.h \
+ Stats.h \
StreamProvider.cpp \
+ StreamProvider.h \
+ StringPredicates.h \
string_table.cpp \
+ string_table.h \
SWFCtype.cpp \
+ SWFCtype.h \
tu_file.cpp \
+ tu_file.h \
URLAccessManager.cpp \
+ URLAccessManager.h \
URL.cpp \
+ URL.h \
utf8.cpp \
+ utf8.h \
+ utility.h \
WallClockTimer.cpp \
+ WallClockTimer.h \
zlib_adapter.cpp \
+ zlib_adapter.h \
$(NULL)
if JEMALLOC
-libgnashbase_la_SOURCES += jemalloc.c
+libgnashbase_la_SOURCES += \
+ jemalloc.c \
+ jemalloc.h \
+ jemalloc_gnash.h \
+ jemalloc_rb.h \
+ jemalloc_types.h \
+ $(NULL)
endif
if ANDROID
@@ -68,7 +116,12 @@ endif
endif
if ENABLE_EXTENSIONS
-libgnashbase_la_SOURCES += extension.cpp sharedlib.cpp
+libgnashbase_la_SOURCES += \
+ extension.cpp \
+ extension.h \
+ sharedlib.cpp \
+ sharedlib.h \
+ $(NULL)
endif
if USE_PNG
@@ -101,6 +154,7 @@ libgnashbase_la_SOURCES += \
if HAVE_VAAPI_GLX
libgnashbase_la_SOURCES += \
+ GnashTexture.h \
GnashVaapiTexture.cpp \
GnashVaapiTexture.h \
$(NULL)
http://git.savannah.gnu.org/cgit//commit/?id=f9779b4d6737b495162becef505f5fdaf92351fc
commit f9779b4d6737b495162becef505f5fdaf92351fc
Author: Andrew Guertin <address@hidden>
Date: Wed Apr 13 04:54:27 2011 -0400
Sort _SOURCES
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index b29d7b0..a185e87 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -21,32 +21,32 @@ sysconf_DATA = gnashrc gnashpluginrc
EXTRA_DIST = gnashrc.in gnashpluginrc.in
libgnashbase_la_SOURCES = \
+ AMF.cpp \
+ arg_parser.cpp \
+ BitsReader.cpp \
+ ClockTime.cpp \
+ curl_adapter.cpp \
+ GC.cpp \
+ GnashFileUtilities.cpp \
GnashImage.cpp \
- SWFCtype.cpp \
GnashImageJpeg.cpp \
- GnashFileUtilities.cpp \
- AMF.cpp \
- RTMP.cpp \
- log.cpp \
+ IOChannel.cpp \
+ log.cpp \
memory.cpp \
+ NamingPolicy.cpp \
+ noseek_fd_adapter.cpp \
rc.cpp \
+ RTMP.cpp \
+ Socket.cpp \
+ StreamProvider.cpp \
string_table.cpp \
+ SWFCtype.cpp \
tu_file.cpp \
- IOChannel.cpp \
- Socket.cpp \
- ClockTime.cpp \
- NamingPolicy.cpp \
- WallClockTimer.cpp \
+ URLAccessManager.cpp \
+ URL.cpp \
utf8.cpp \
- curl_adapter.cpp \
- noseek_fd_adapter.cpp \
+ WallClockTimer.cpp \
zlib_adapter.cpp \
- URL.cpp \
- GC.cpp \
- BitsReader.cpp \
- arg_parser.cpp \
- URLAccessManager.cpp \
- StreamProvider.cpp \
$(NULL)
if JEMALLOC
http://git.savannah.gnu.org/cgit//commit/?id=1d5e8ed9f5c606f82fac0c7ff6505edb08d7e31f
commit 1d5e8ed9f5c606f82fac0c7ff6505edb08d7e31f
Author: Andrew Guertin <address@hidden>
Date: Wed Apr 13 04:49:41 2011 -0400
Move (most) conditional headers into _SOURCES
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 756bee0..b29d7b0 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -72,39 +72,36 @@ libgnashbase_la_SOURCES += extension.cpp sharedlib.cpp
endif
if USE_PNG
-libgnashbase_la_SOURCES += GnashImagePng.cpp
+libgnashbase_la_SOURCES += \
+ GnashImagePng.cpp \
+ GnashImagePng.h \
+ $(NULL)
endif
if USE_GIF
-libgnashbase_la_SOURCES += GnashImageGif.cpp
+libgnashbase_la_SOURCES += \
+ GnashImageGif.cpp \
+ GnashImageGif.h \
+ $(NULL)
endif
if BUILD_OGL_RENDERER
- libgnashbase_la_SOURCES += \
+libgnashbase_la_SOURCES += \
GnashTexture.cpp \
- $(NULL)
-
- noinst_HEADERS += \
GnashTexture.h \
$(NULL)
endif
if HAVE_VAAPI
- libgnashbase_la_SOURCES += \
+libgnashbase_la_SOURCES += \
GnashVaapiImage.cpp \
- $(NULL)
-
- noinst_HEADERS += \
GnashVaapiImage.h \
GnashVaapiImageProxy.h \
$(NULL)
if HAVE_VAAPI_GLX
- libgnashbase_la_SOURCES += \
+libgnashbase_la_SOURCES += \
GnashVaapiTexture.cpp \
- $(NULL)
-
- noinst_HEADERS += \
GnashVaapiTexture.h \
$(NULL)
endif
@@ -148,8 +145,6 @@ if HAIKU
libgnashbase_la_LIBADD += $(HAIKU_LIBS)
endif
-noinst_HEADERS =
-
inst_HEADERS = \
accumulator.h \
SimpleBuffer.h \
@@ -183,13 +178,6 @@ inst_HEADERS = \
StreamProvider.h \
$(NULL)
-if USE_PNG
-noinst_HEADERS += GnashImagePng.h
-endif
-if USE_GIF
-noinst_HEADERS += GnashImageGif.h
-endif
-
if ENABLE_EXTENSIONS
inst_HEADERS += extension.h sharedlib.h
endif
http://git.savannah.gnu.org/cgit//commit/?id=23185dee082e2206ab6ef5f47135891b97122227
commit 23185dee082e2206ab6ef5f47135891b97122227
Author: Andrew Guertin <address@hidden>
Date: Wed Apr 13 04:45:39 2011 -0400
Condense libgnashbase_la_LIBADD
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 22f35ed..756bee0 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -141,11 +141,9 @@ libgnashbase_la_LIBADD = \
$(BOOST_LIBS) \
$(OPENGL_LIBS) \
$(PTHREAD_LIBS) \
+ $(LTDL_LIBS) \
$(NULL)
-
-libgnashbase_la_LIBADD += $(LTDL_LIBS)
-
if HAIKU
libgnashbase_la_LIBADD += $(HAIKU_LIBS)
endif
http://git.savannah.gnu.org/cgit//commit/?id=14fd995d6a81e335c249693f44a2912b08fa192f
commit 14fd995d6a81e335c249693f44a2912b08fa192f
Author: Andrew Guertin <address@hidden>
Date: Wed Apr 13 04:36:52 2011 -0400
Add jemalloc to _SOURCES the same way as everything else
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 0152bb1..22f35ed 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -21,7 +21,6 @@ sysconf_DATA = gnashrc gnashpluginrc
EXTRA_DIST = gnashrc.in gnashpluginrc.in
libgnashbase_la_SOURCES = \
- $(MALLOC) \
GnashImage.cpp \
SWFCtype.cpp \
GnashImageJpeg.cpp \
@@ -50,6 +49,10 @@ libgnashbase_la_SOURCES = \
StreamProvider.cpp \
$(NULL)
+if JEMALLOC
+libgnashbase_la_SOURCES += jemalloc.c
+endif
+
if ANDROID
libgnashbase_la_SOURCES += SharedMemHaiku.cpp
else
@@ -147,16 +150,6 @@ if HAIKU
libgnashbase_la_LIBADD += $(HAIKU_LIBS)
endif
-# Maybe use jemalloc, which handles memory fragmentation for
-# ECAMscript languages better than the regular system malloc.
-# This is controlled by the --enable-jemalloc (disabled by default)
-# configure option.
-if JEMALLOC
-MALLOC = jemalloc.c
-else
-MALLOC =
-endif
-
noinst_HEADERS =
inst_HEADERS = \
http://git.savannah.gnu.org/cgit//commit/?id=d3e8f6854af250b31a1522f017f12fed5c3b00f5
commit d3e8f6854af250b31a1522f017f12fed5c3b00f5
Author: Andrew Guertin <address@hidden>
Date: Wed Apr 13 04:34:47 2011 -0400
Whitespace, useless comment, duplicated code
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 3c2c354..0152bb1 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -108,12 +108,9 @@ endif
endif
-
-
# this is where Gnash plugins get installed
pluginsdir = $(prefix)/lib/gnash/plugins
-
libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
$(PTHREAD_CFLAGS) \
@@ -131,8 +128,6 @@ if ANDROID
libgnashbase_la_CPPFLAGS += $(ANDROID_NDK)/usr/include
endif
-# These headers get installed
-
libgnashbase_la_LIBADD = \
$(JPEG_LIBS) \
$(PNG_LIBS) \
@@ -152,10 +147,6 @@ if HAIKU
libgnashbase_la_LIBADD += $(HAIKU_LIBS)
endif
-if WIN32
- libgnashbase_la_LIBADD += -lws2_32 -lwinmm
-endif
-
# Maybe use jemalloc, which handles memory fragmentation for
# ECAMscript languages better than the regular system malloc.
# This is controlled by the --enable-jemalloc (disabled by default)
http://git.savannah.gnu.org/cgit//commit/?id=de743f6360ef6731db36edb07d52ef3a772d0224
commit de743f6360ef6731db36edb07d52ef3a772d0224
Author: Andrew Guertin <address@hidden>
Date: Wed Apr 13 04:32:30 2011 -0400
Move all setting of libgnashbase_la_SOURCES together
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 8255719..3c2c354 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -20,41 +20,6 @@ pkglib_LTLIBRARIES = libgnashbase.la
sysconf_DATA = gnashrc gnashpluginrc
EXTRA_DIST = gnashrc.in gnashpluginrc.in
-# this is where Gnash plugins get installed
-pluginsdir = $(prefix)/lib/gnash/plugins
-
-
-libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
- $(PTHREAD_CFLAGS) \
- $(PNG_CFLAGS) \
- $(GIF_CFLAGS) \
- $(CURL_CFLAGS) \
- $(Z_CFLAGS) \
- $(JPEG_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(OPENGL_CFLAGS) \
- $(LTDL_CFLAGS) \
- $(NULL)
-
-if ANDROID
-libgnashbase_la_CPPFLAGS += $(ANDROID_NDK)/usr/include
-endif
-
-# These headers get installed
-
-libgnashbase_la_LIBADD = \
- $(JPEG_LIBS) \
- $(PNG_LIBS) \
- $(GIF_LIBS) \
- $(Z_LIBS) \
- $(CURL_LIBS) \
- $(LIBINTL) \
- $(BOOST_LIBS) \
- $(OPENGL_LIBS) \
- $(PTHREAD_LIBS) \
- $(NULL)
-
libgnashbase_la_SOURCES = \
$(MALLOC) \
GnashImage.cpp \
@@ -85,7 +50,6 @@ libgnashbase_la_SOURCES = \
StreamProvider.cpp \
$(NULL)
-
if ANDROID
libgnashbase_la_SOURCES += SharedMemHaiku.cpp
else
@@ -112,6 +76,76 @@ if USE_GIF
libgnashbase_la_SOURCES += GnashImageGif.cpp
endif
+if BUILD_OGL_RENDERER
+ libgnashbase_la_SOURCES += \
+ GnashTexture.cpp \
+ $(NULL)
+
+ noinst_HEADERS += \
+ GnashTexture.h \
+ $(NULL)
+endif
+
+if HAVE_VAAPI
+ libgnashbase_la_SOURCES += \
+ GnashVaapiImage.cpp \
+ $(NULL)
+
+ noinst_HEADERS += \
+ GnashVaapiImage.h \
+ GnashVaapiImageProxy.h \
+ $(NULL)
+
+if HAVE_VAAPI_GLX
+ libgnashbase_la_SOURCES += \
+ GnashVaapiTexture.cpp \
+ $(NULL)
+
+ noinst_HEADERS += \
+ GnashVaapiTexture.h \
+ $(NULL)
+endif
+endif
+
+
+
+
+# this is where Gnash plugins get installed
+pluginsdir = $(prefix)/lib/gnash/plugins
+
+
+libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ $(PTHREAD_CFLAGS) \
+ $(PNG_CFLAGS) \
+ $(GIF_CFLAGS) \
+ $(CURL_CFLAGS) \
+ $(Z_CFLAGS) \
+ $(JPEG_CFLAGS) \
+ $(BOOST_CFLAGS) \
+ $(OPENGL_CFLAGS) \
+ $(LTDL_CFLAGS) \
+ $(NULL)
+
+if ANDROID
+libgnashbase_la_CPPFLAGS += $(ANDROID_NDK)/usr/include
+endif
+
+# These headers get installed
+
+libgnashbase_la_LIBADD = \
+ $(JPEG_LIBS) \
+ $(PNG_LIBS) \
+ $(GIF_LIBS) \
+ $(Z_LIBS) \
+ $(CURL_LIBS) \
+ $(LIBINTL) \
+ $(BOOST_LIBS) \
+ $(OPENGL_LIBS) \
+ $(PTHREAD_LIBS) \
+ $(NULL)
+
+
libgnashbase_la_LIBADD += $(LTDL_LIBS)
if HAIKU
@@ -212,36 +246,6 @@ inst_HEADERS += $(EXTENSIONS_API)
libgnashbase_la_LDFLAGS = -release $(VERSION)
libgnashbase_la_DEPENDENCIES =
-if BUILD_OGL_RENDERER
- libgnashbase_la_SOURCES += \
- GnashTexture.cpp \
- $(NULL)
-
- noinst_HEADERS += \
- GnashTexture.h \
- $(NULL)
-endif
-
-if HAVE_VAAPI
- libgnashbase_la_SOURCES += \
- GnashVaapiImage.cpp \
- $(NULL)
-
- noinst_HEADERS += \
- GnashVaapiImage.h \
- GnashVaapiImageProxy.h \
- $(NULL)
-
-if HAVE_VAAPI_GLX
- libgnashbase_la_SOURCES += \
- GnashVaapiTexture.cpp \
- $(NULL)
-
- noinst_HEADERS += \
- GnashVaapiTexture.h \
- $(NULL)
-endif
-
if HAVE_VAAPI
libgnashbase_la_CPPFLAGS += \
-I$(top_srcdir)/libvaapi \
@@ -255,7 +259,6 @@ if HAVE_VAAPI
$(top_builddir)/libvaapi/libgnashvaapi.la \
$(NULL)
endif
-endif
if WIN32
libgnashbase_la_LDFLAGS += -no-undefined
http://git.savannah.gnu.org/cgit//commit/?id=f9c278c45a719bd7f291f692a1a58c0c485f5ed6
commit f9c278c45a719bd7f291f692a1a58c0c485f5ed6
Author: Andrew Guertin <address@hidden>
Date: Wed Apr 13 04:27:53 2011 -0400
Move gnashrc and gnashpluginrc things to the bottom
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 7220975..8255719 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -104,20 +104,6 @@ if ENABLE_EXTENSIONS
libgnashbase_la_SOURCES += extension.cpp sharedlib.cpp
endif
-edit = sed \
- -e 's|@address@hidden|$(DEFAULT_FLASH_PLATFORM_ID)|g' \
- -e 's|@address@hidden|$(DEFAULT_FLASH_MAJOR_VERSION)|g' \
- -e 's|@address@hidden|$(DEFAULT_FLASH_MINOR_VERSION)|g' \
- -e 's|@address@hidden|$(DEFAULT_FLASH_REV_NUMBER)|g' \
- -e 's|@address@hidden|$(DEFAULT_STREAMS_TIMEOUT)|g' \
- -e 's|@address@hidden|$(DEFAULT_SOL_SAFEDIR)|g'
-
-gnashrc: gnashrc.in Makefile
- $(edit) '$(srcdir)/address@hidden' >$@
-
-gnashpluginrc: gnashpluginrc.in
- $(edit) '$(srcdir)/address@hidden' >$@
-
if USE_PNG
libgnashbase_la_SOURCES += GnashImagePng.cpp
endif
@@ -280,6 +266,20 @@ if ENABLE_PCH
AM_CXXFLAGS = $(PCH_FLAGS)
endif
+edit = sed \
+ -e 's|@address@hidden|$(DEFAULT_FLASH_PLATFORM_ID)|g' \
+ -e 's|@address@hidden|$(DEFAULT_FLASH_MAJOR_VERSION)|g' \
+ -e 's|@address@hidden|$(DEFAULT_FLASH_MINOR_VERSION)|g' \
+ -e 's|@address@hidden|$(DEFAULT_FLASH_REV_NUMBER)|g' \
+ -e 's|@address@hidden|$(DEFAULT_STREAMS_TIMEOUT)|g' \
+ -e 's|@address@hidden|$(DEFAULT_SOL_SAFEDIR)|g'
+
+gnashrc: gnashrc.in Makefile
+ $(edit) '$(srcdir)/address@hidden' >$@
+
+gnashpluginrc: gnashpluginrc.in
+ $(edit) '$(srcdir)/address@hidden' >$@
+
CLEANFILES = gnashrc gnashpluginrc
# Remove libtool .la files
http://git.savannah.gnu.org/cgit//commit/?id=09eb36cad0a3ec3ca6492ac136d782942c1f1829
commit 09eb36cad0a3ec3ca6492ac136d782942c1f1829
Author: Andrew Guertin <address@hidden>
Date: Wed Apr 13 04:25:43 2011 -0400
Move declarations of what's getting installed to the top
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 3748516..7220975 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -16,14 +16,13 @@
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = gnashrc.in gnashpluginrc.in
-
+pkglib_LTLIBRARIES = libgnashbase.la
sysconf_DATA = gnashrc gnashpluginrc
+EXTRA_DIST = gnashrc.in gnashpluginrc.in
# this is where Gnash plugins get installed
pluginsdir = $(prefix)/lib/gnash/plugins
-pkglib_LTLIBRARIES = libgnashbase.la
libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
http://git.savannah.gnu.org/cgit//commit/?id=c37db484ccea5cff8dec4c9bd34878462a31e0a9
commit c37db484ccea5cff8dec4c9bd34878462a31e0a9
Author: Andrew Guertin <address@hidden>
Date: Sat Apr 2 07:56:47 2011 -0400
List appropriate headers in libgnashvaapi_la_SOURCES
diff --git a/libvaapi/Makefile.am b/libvaapi/Makefile.am
index 8584166..7d5283e 100644
--- a/libvaapi/Makefile.am
+++ b/libvaapi/Makefile.am
@@ -35,31 +35,26 @@ libgnashvaapi_la_LIBADD = \
$(NULL)
libgnashvaapi_la_SOURCES = \
- vaapi_utils.cpp \
- VaapiContext.cpp \
- VaapiDisplay.cpp \
- VaapiGlobalContext.cpp \
- VaapiImage.cpp \
- VaapiImageFormat.cpp \
- VaapiSubpicture.cpp \
- VaapiSurface.cpp \
- VaapiSurfaceProxy.cpp \
- $(NULL)
-
-noinst_HEADERS = \
vaapi_common.h \
+ vaapi_utils.cpp \
vaapi_utils.h \
+ VaapiContext.cpp \
VaapiContext.h \
+ VaapiDisplay.cpp \
VaapiDisplay.h \
VaapiDisplayX11.h \
- VaapiDisplayGLX.h \
VaapiException.h \
+ VaapiGlobalContext.cpp \
VaapiGlobalContext.h \
+ VaapiImage.cpp \
VaapiImage.h \
+ VaapiImageFormat.cpp \
VaapiImageFormat.h \
+ VaapiSubpicture.cpp \
VaapiSubpicture.h \
+ VaapiSurface.cpp \
VaapiSurface.h \
- VaapiSurfaceGLX.h \
+ VaapiSurfaceProxy.cpp \
VaapiSurfaceProxy.h \
$(NULL)
@@ -73,7 +68,9 @@ libgnashvaapi_la_LIBADD += \
$(NULL)
libgnashvaapi_la_SOURCES += \
+ VaapiDisplayGLX.h \
VaapiSurfaceGLX.cpp \
+ VaapiSurfaceGLX.h \
$(NULL)
endif
-----------------------------------------------------------------------
Summary of changes:
libbase/Makefile.am | 280 +++++++++++++++++++++++++++-----------------------
libmedia/Makefile.am | 250 ++++++++++++++++++++++-----------------------
libsound/Makefile.am | 85 ++++++++-------
libvaapi/Makefile.am | 25 ++---
4 files changed, 332 insertions(+), 308 deletions(-)
hooks/post-receive
--
Gnash
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-302-g815855b,
Sandro Santilli <=