From 1c7db040a3567b460283de2aefccff3046fb2e3d Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@gnome.org>
Date: Mon, 24 Nov 2003 04:08:47 +0000
Subject: tagging stuff and build fixes. In detail:

Original commit message from CVS:
tagging stuff and build fixes. In detail:
- make gdk-pixbuf loader work when distchecking
- fix invalid syntax in ffmpeg Makefile. wildcards for EXTRA_DIST are not allowed. This broke builds where distdir != srcdir
- fix ffmpeg cvs grabbing when srcdir != distdir
- new id3tag plugin for id3 tag reading/writing (uses mad's libid3tag)
- mad and libid3tag require mad/libid3tag v0.15. Fixed configure to require that
- added ogg demuxer in ext/ogg. The demuxer does not handle events yet. Especially getting seeking right will require some effort or code copying from libvorbis.
- added raw vorbis detection to typefinding. oggdemux requires a typefind function to detect its contents.
- tags plugin in gst/tags. Provides API in <gst/tags/gsttagediting.h>. API includes tag matching GStreamer <=> ID3 and GStreamer <=> vorbis and writing/reading vorbiscomments or ID3v1 tags. Also included is a simple vorbiscomment reader/writer. Writing will not really work though until someone writes oggmux.
- various build fixes. Mostly missing (DIST)CLEANFILES.
- vorbisenc handles tag writing.

Now it's YOUR turn to fix and write more plugins that handle writing/reading of tags. :)
---
 ext/Makefile.am            |  8 ++++++++
 ext/gdk_pixbuf/Makefile.am | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'ext')

diff --git a/ext/Makefile.am b/ext/Makefile.am
index d70a37e8..a26660d7 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -196,6 +196,12 @@ else
 MPLEX_DIR=
 endif
 
+if USE_OGG
+OGG_DIR=ogg
+else
+OGG_DIR=
+endif
+
 if USE_PANGO
 PANGO_DIR=pango
 else
@@ -313,6 +319,7 @@ SUBDIRS=\
 	$(MIKMOD_DIR) \
 	$(MPEG2DEC_DIR) \
 	$(MPLEX_DIR) \
+	$(OGG_DIR) \
 	$(PANGO_DIR) \
 	$(RAW1394_DIR) \
 	$(SDL_DIR) \
@@ -361,6 +368,7 @@ DIST_SUBDIRS=\
 	mikmod \
 	mpeg2dec \
 	mplex \
+	ogg \
 	pango \
 	raw1394 \
 	sdl \
diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am
index b017fa56..82e0d3ef 100644
--- a/ext/gdk_pixbuf/Makefile.am
+++ b/ext/gdk_pixbuf/Makefile.am
@@ -8,7 +8,7 @@ libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 
 if HAVE_GDK_LOADERS
-loaderdir = $(GDK_PIXBUF_LOADER_DIR)
+loaderdir = $(DESTDIR)$(GDK_PIXBUF_LOADER_DIR)
 loader_LTLIBRARIES = gst_loader.la
 
 gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND
@@ -20,11 +20,11 @@ gst_loader_la_LIBADD = $(GTK_LIBS) $(GST_LIBS)
 
 gst_loader_headers = gstgdkanimation.h
 
-#install-data-hook:
-#	if test -z "$(DESTDIR)"  ; then
-#	  $(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_SYSCONFDIR)/gtk-2.0 ; \
-#	  $(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_SYSCONFDIR)/gtk-2.0/gdk-pixbuf.loaders ; \
-#	fi
+install-data-hook:
+	if test -z "$(DESTDIR)"  ; then \
+	  $(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_SYSCONFDIR)/gtk-2.0 ; \
+	  $(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_SYSCONFDIR)/gtk-2.0/gdk-pixbuf.loaders ; \
+	fi
 
 else
 gst_loader_headers =
-- 
cgit