Fix the build afer the reorg.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

diff --git a/.gitignore b/.gitignore
index 63f6b59cd9ae503e2b344b73766896642b51fc4e..dd70438fce6df92fec446010d4b8eb3dce165e0f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 config.mak
 config.h
 .depend
+*~
+

diff --git a/Makefile b/Makefile
index 264fdaa107924a0dfc334e7b3cf8824e84d99db0..21f01cca4858ec5c1beabed26a30124284e815e2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,6 @@
 SUBDIRS = src/framework \
-                 src/inigo \
-                 src/valerie \
-                 src/miracle \
-                 src/humperdink \
-                 src/albino \
+                 src/mlt++ \
+                 src/melt \
                  src/modules \
                  profiles
 
@@ -46,7 +43,8 @@ install:
 
 uninstall:
        rm -f "$(DESTDIR)$(bindir)"/mlt-config
-       rm -f "$(DESTDIR)$(libdir)"/pkgconfig/mlt-*.pc
+       rm -f "$(DESTDIR)$(libdir)"/pkgconfig/mlt-framework.pc
+       rm -f "$(DESTDIR)$(libdir)"/pkgconfig/mlt++.pc
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \
                $(MAKE) DESTDIR=$(DESTDIR) -C $$subdir $@ || exit 1; \

diff --git a/configure b/configure
index 72bbfe51d974b6d96bc69e0f9b317546b8faa3f5..f87bc3593702053fa842fbd1cb74bd01b6d727b9 100755 (executable)
--- a/configure
+++ b/configure
@@ -23,7 +23,7 @@ General build options:
   --arch='arch'             - Compile for a specific architecture (default: none)
   --cpu='cpu'             - Compile for a specific CPU (default: none)
 
-Module disables options:
+Module disable options:
 
 EOF
 
@@ -108,19 +108,27 @@ build_config()
 
 build_pkgconfig()
 {
-       for i in framework valerie miracle
-       do
-               echo prefix="$prefix" > mlt-$i.pc
-               (
-                       echo exec_prefix=$prefix
-                       echo libdir=$libdir
-                       echo includedir=$prefix/include
-                       echo version=$version
-                       echo cflags=`grep ^$i packages.dat | cut -f 2`
-                       echo libs=`grep ^$i packages.dat | cut -f 3`
-               ) >> mlt-$i.pc
-               cat mlt-$i.pc.in >>mlt-$i.pc
-       done
+       echo prefix="$prefix" > mlt-framework.pc
+       (
+               echo exec_prefix=$prefix
+               echo libdir=$libdir
+               echo includedir=$prefix/include
+               echo version=$version
+               echo cflags=`grep ^framework packages.dat | cut -f 2`
+               echo libs=`grep ^framework packages.dat | cut -f 3`
+       ) >> mlt-framework.pc
+       cat mlt-framework.pc.in >>mlt-framework.pc
+
+       echo prefix="$prefix" > mlt++.pc
+       (
+               echo exec_prefix=$prefix
+               echo libdir=$libdir
+               echo includedir=$prefix/include
+               echo version=$version
+               echo cflags=`grep ^mlt++ packages.dat | cut -f 2`
+               echo libs=`grep ^mlt++ packages.dat | cut -f 3`
+       ) >> mlt++.pc
+       cat mlt++.pc.in >>mlt++.pc
 }
 
 # Debug mode
@@ -225,7 +233,7 @@ else
 fi
 
 # Iterate through each of the components
-for i in framework modules inigo valerie miracle humperdink
+for i in framework modules melt mlt++
 do
        if [ -x src/$i/configure ]
        then

diff --git a/mlt++.pc.in b/mlt++.pc.in
new file mode 100644 (file)
index 0000000..e917a67
--- /dev/null
+++ b/mlt++.pc.in
@@ -0,0 +1,7 @@
+
+Name: mlt++
+Description: C++ API for MLT multimedia framework
+Version: ${version}
+Requires: mlt-framework
+Libs: -L${libdir} ${libs}
+Cflags: ${cflags}

diff --git a/setenv b/setenv
index 53b5f6ed2cff49d40b0c0644c9442cc9a5a9dc87..36d8e8e81f19e249df8f79de48d383b000c82af3 100644 (file)
--- a/setenv
+++ b/setenv
@@ -7,8 +7,6 @@ export MLT_PROFILES_PATH=`pwd`/profiles
 
 export LD_LIBRARY_PATH=\
 `pwd`/src/framework:\
-`pwd`/src/valerie:\
-`pwd`/src/miracle:\
 `pwd`/src/modules/bluefish:\
 `pwd`/../BlueLinuxDriver/install/lib:\
 `pwd`/../mpeg_sdk_release/bin:\
@@ -18,9 +16,4 @@ $LD_LIBRARY_PATH
 
 [ $(uname -s) = Darwin ] && export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
 
-export PATH=\
-`pwd`/src/albino:\
-`pwd`/src/inigo:\
-`pwd`/src/humperdink:\
-`pwd`/src/miracle:\
-$PATH
+export PATH=`pwd`/src/melt:$PATH

diff --git a/src/examples/Makefile b/src/examples/Makefile
index 5a10be2fede85fd948fead4aa4800fce86990673..d7bf02fb6e9f9e66147249c308a86f7b4850065b 100644 (file)
--- a/src/examples/Makefile
+++ b/src/examples/Makefile
@@ -1,22 +1,17 @@
 include ../config.mak
 
 CXXFLAGS+=-Wall -g `pkg-config mlt-framework --cflags` -I ../src
-LDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `pkg-config mlt-framework --libs`
+LDFLAGS+=-L../src -lmlt++ `pkg-config mlt-framework --libs`
 CC=c++
 
-all:           play server
+all:           play
 
 play:          play.o
 
 play.o:                play.cpp
 
-server:                server.o
-
-server.o:      server.cpp
-
 clean:
        $(RM) play play.o
-       $(RM) server server.o
 
 distclean: clean
 

diff --git a/src/melt/Makefile b/src/melt/Makefile
index c206a8128c9ea09fb83f4e96463dfd96babea414..239bb393a298046afad2372017514f168173dd6c 100644 (file)
--- a/src/melt/Makefile
+++ b/src/melt/Makefile
@@ -1,8 +1,8 @@
 include ../../config.mak
 
-TARGET = inigo
+TARGET = melt
 
-OBJS = inigo.o \
+OBJS = melt.o \
           io.o
 
 CFLAGS += -I.. $(RDYNAMIC) -DVERSION=\"$(version)\"

diff --git a/src/mlt++/Makefile b/src/mlt++/Makefile
index 651a4432a3a8d25a7d3cdc7cbea9702f934e1680..28f465d5e07ca281e8a54a5330f1af44cdb7b748 100644 (file)
--- a/src/mlt++/Makefile
+++ b/src/mlt++/Makefile
@@ -1,4 +1,5 @@
-include ../config.mak
+include ../../config.mak
+include config.mak
 INSTALL = install
 
 ifneq ($(targetos), Darwin)
@@ -13,6 +14,10 @@ SONAME = libmlt++.$(soversion)$(LIBSUF)
 LIBFLAGS += -install_name $(libdir)/$(SONAME) -current_version $(version) -compatibility_version $(soversion)
 endif
 
+CXXFLAGS += -I.. $(RDYNAMIC) -DVERSION=\"$(version)\"
+
+LDFLAGS += -L../framework -lmlt -lpthread
+
 OBJS = MltConsumer.o \
           MltDeque.o \
           MltEvent.o \
@@ -22,7 +27,6 @@ OBJS = MltConsumer.o \
           MltFilteredConsumer.o \
           MltFrame.o \
           MltGeometry.o \
-          MltMiracle.o \
           MltMultitrack.o \
           MltParser.o \
           MltPlaylist.o \
@@ -31,7 +35,6 @@ OBJS = MltConsumer.o \
           MltProperties.o \
           MltPushConsumer.o \
           MltRepository.o \
-          MltResponse.o \
           MltService.o \
           MltTokeniser.o \
           MltTractor.o \
@@ -47,6 +50,9 @@ $(TARGET):    $(OBJS)
        ln -sf $(TARGET) $(NAME)
        ln -sf $(TARGET) $(SONAME)
 
+depend:        $(SRCS)
+       $(CXX) -MM $(CXXFLAGS) $^ 1>.depend
+
 clean:
        $(RM) $(OBJS) $(TARGET) $(NAME)
 
@@ -59,10 +65,13 @@ install:
        ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(SONAME)
        $(INSTALL) -d "$(DESTDIR)$(prefix)/include/mlt++"
        $(INSTALL) -m 644 $(HEADERS) "$(DESTDIR)$(prefix)/include/mlt++"
-       /sbin/ldconfig 2> /dev/null || true
 
 uninstall:
        rm -f "$(DESTDIR)$(libdir)/$(TARGET)"
        rm -f "$(DESTDIR)$(libdir)/$(NAME)"
        rm -f "$(DESTDIR)$(libdir)/$(SONAME)"
        rm -rf "$(DESTDIR)$(prefix)/include/mlt++"
+
+ifneq ($(wildcard .depend),)
+include .depend
+endif

diff --git a/src/mlt++/Mlt.h b/src/mlt++/Mlt.h
index 4dab95a1a093f2b35ca0efa695e154e5c24a12c5..09aa3c6ede77f7e061377b5333ee0f8568405489 100644 (file)
--- a/src/mlt++/Mlt.h
+++ b/src/mlt++/Mlt.h
@@ -30,9 +30,6 @@
 #include "MltFilteredConsumer.h"
 #include "MltFrame.h"
 #include "MltGeometry.h"
-#ifndef WIN32
-#include "MltMiracle.h"
-#endif
 #include "MltMultitrack.h"
 #include "MltParser.h"
 #include "MltPlaylist.h"
@@ -41,9 +38,6 @@
 #include "MltProperties.h"
 #include "MltPushConsumer.h"
 #include "MltRepository.h"
-#ifndef WIN32
-#include "MltResponse.h"
-#endif
 #include "MltService.h"
 #include "MltTokeniser.h"
 #include "MltTractor.h"

diff --git a/src/mlt++/configure b/src/mlt++/configure
new file mode 100755 (executable)
index 0000000..57f305d
--- /dev/null
+++ b/src/mlt++/configure
@@ -0,0 +1,18 @@
+#!/bin/sh
+echo "mlt++    -I$prefix/include -I$prefix/include/mlt++ -D_REENTRANT  -L$libdir -lmlt++" >> ../../packages.dat
+
+WARNINGS="-W -Wwrite-strings -Wcast-qual -Wpointer-arith -Wcast-align -Wredundant-decls"
+
+targetos=$(uname -s)
+case $targetos in 
+       Darwin)
+               echo LIBSUF=.dylib
+               echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC"
+               echo "LIBFLAGS=-dynamiclib -single_module"
+               ;;
+       Linux|FreeBSD)
+               echo LIBSUF=.so
+               echo "CXXFLAGS+=-pthread -Wall $WARNINGS"
+               echo "LIBFLAGS=-shared"
+               ;;
+esac > config.mak

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index a3132aedd5828870a44506f7523d62d1193ce642..99b477723e4de35b9e33c03831169068e327f2e1 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -5,6 +5,8 @@ TARGET = ../libmltcore$(LIBSUF)
 OBJS = factory.o \
           producer_colour.o \
           producer_consumer.o \
+          producer_hold.o \
+          producer_loader.o \
           producer_noise.o \
           producer_ppm.o \
           filter_brightness.o \
@@ -56,7 +58,10 @@ clean:
 
 install: all
        install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -m 644 ../data_fx.properties "$(DESTDIR)$(prefix)/share/mlt"
+       install -d "$(DESTDIR)$(prefix)/share/mlt/core"
+       install -m 644 data_fx.properties "$(DESTDIR)$(prefix)/share/mlt/core"
+       install -m 644 loader.dict "$(DESTDIR)$(prefix)/share/mlt/core"
+       install -m 644 loader.ini "$(DESTDIR)$(prefix)/share/mlt/core"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/core/factory.c b/src/modules/core/factory.c
index 755597f96e0c0b163e7e7308e4db2ce858d80674..369a649e0a7c59cce879835d76078e0b551769de 100644 (file)
--- a/src/modules/core/factory.c
+++ b/src/modules/core/factory.c
@@ -40,6 +40,8 @@ extern mlt_filter filter_transition_init( mlt_profile profile, mlt_service_type
 extern mlt_filter filter_watermark_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_producer producer_colour_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_producer producer_consumer_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+extern mlt_producer producer_fezzik_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
+extern mlt_producer producer_hold_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_producer producer_noise_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 extern mlt_producer producer_ppm_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
 #include "transition_composite.h"
@@ -70,6 +72,8 @@ MLT_REPOSITORY
        MLT_REGISTER( producer_type, "color", producer_colour_init );
        MLT_REGISTER( producer_type, "colour", producer_colour_init );
        MLT_REGISTER( producer_type, "consumer", producer_consumer_init );
+       MLT_REGISTER( producer_type, "fezzik", producer_fezzik_init );
+       MLT_REGISTER( producer_type, "hold", producer_hold_init );
        MLT_REGISTER( producer_type, "noise", producer_noise_init );
        MLT_REGISTER( producer_type, "ppm", producer_ppm_init );
        MLT_REGISTER( transition_type, "composite", transition_composite_init );

diff --git a/src/modules/feeds/Makefile b/src/modules/feeds/Makefile
index 748ce4770d929c29007d3009f5a90fa61a8e366d..706a6939be04186f4781162d04b9e843fe0bddf4 100644 (file)
--- a/src/modules/feeds/Makefile
+++ b/src/modules/feeds/Makefile
@@ -9,7 +9,7 @@ distclean:
 clean:
 
 install:       all
-       install -d $(DESTDIR)$(prefix)/share/mlt/feeds/PAL
-       install -d $(DESTDIR)$(prefix)/share/mlt/feeds/NTSC
-       install -m 644 PAL/*.* $(DESTDIR)$(prefix)/share/mlt/feeds/PAL
-       install -m 644 NTSC/*.* $(DESTDIR)$(prefix)/share/mlt/feeds/NTSC
+       install -d "$(DESTDIR)$(prefix)/share/mlt/feeds/PAL"
+       install -d "$(DESTDIR)$(prefix)/share/mlt/feeds/NTSC"
+       install -m 644 PAL/*.* "$(DESTDIR)$(prefix)/share/mlt/feeds/PAL"
+       install -m 644 NTSC/*.* "$(DESTDIR)$(prefix)/share/mlt/feeds/NTSC"

diff --git a/src/modules/fezzik/Makefile b/src/modules/fezzik/Makefile
deleted file mode 100644 (file)
index 52b5129..0000000
--- a/src/modules/fezzik/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-include ../../../config.mak
-
-TARGET = ../libmltfezzik$(LIBSUF)
-
-OBJS = factory.o \
-          producer_fezzik.o \
-          producer_hold.o 
-
-CFLAGS += -I../..
-
-LDFLAGS += -L../../framework -lmlt
-
-SRCS := $(OBJS:.o=.c)
-
-all:   $(TARGET)
-
-$(TARGET): $(OBJS)
-               $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
-
-depend:        $(SRCS)
-               $(CC) -MM $(CFLAGS) $^ 1>.depend
-
-distclean:     clean
-               rm -f .depend
-
-clean: 
-               rm -f $(OBJS) $(TARGET) 
-
-install: all
-       install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -m 644 ../fezzik.dict "$(DESTDIR)$(prefix)/share/mlt"
-       install -m 644 ../fezzik.ini "$(DESTDIR)$(prefix)/share/mlt"
-
-ifneq ($(wildcard .depend),)
-include .depend
-endif

diff --git a/src/modules/fezzik/factory.c b/src/modules/fezzik/factory.c
deleted file mode 100644 (file)
index 87f22b9..0000000
--- a/src/modules/fezzik/factory.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * factory.c -- the factory method interfaces
- * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
- * Author: Charles Yates <charles.yates@pandora.be>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <framework/mlt.h>
-#include <string.h>
-
-extern mlt_producer producer_fezzik_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
-extern mlt_producer producer_hold_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg );
-
-MLT_REPOSITORY
-{
-       MLT_REGISTER( producer_type, "fezzik", producer_fezzik_init );
-       MLT_REGISTER( producer_type, "hold", producer_hold_init );
-}

diff --git a/src/modules/melt/Makefile b/src/modules/melt/Makefile
index b2e297f131a37cc4911ffe44dfbed5aa8371da6e..2e70fd927e9f23821cb164df2b728d462e05bca3 100644 (file)
--- a/src/modules/melt/Makefile
+++ b/src/modules/melt/Makefile
@@ -1,9 +1,9 @@
 include ../../../config.mak
 
-TARGET = ../libmltinigo$(LIBSUF)
+TARGET = ../libmltmelt$(LIBSUF)
 
 OBJS = factory.o \
-          producer_inigo.o 
+          producer_melt.o 
 
 CFLAGS += -I../..
 

diff --git a/src/modules/valerie/Makefile b/src/modules/mvsp/Makefile
similarity index 82%
rename from src/modules/valerie/Makefile
rename to src/modules/mvsp/Makefile
index 9cdd020a8f9cdce49d09ff8858f5fc81b32d14d2..3e5cdafbcfbe2fcc64c20c7554547fa0ec95db8b 100644 (file)
--- a/src/modules/valerie/Makefile
+++ b/src/modules/mvsp/Makefile
@@ -1,13 +1,13 @@
 include ../../../config.mak
 
-TARGET = ../libmltvalerie$(LIBSUF)
+TARGET = ../libmltmvsp$(LIBSUF)
 
 OBJS = factory.o \
-          consumer_valerie.o
+          consumer_mvsp.o
 
 CFLAGS += -I../.. 
 
-LDFLAGS += -L../../valerie -lvalerie
+LDFLAGS += -L../../mvsp -lmvsp
 LDFLAGS += -L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)

diff --git a/src/modules/mvsp/configure b/src/modules/mvsp/configure
new file mode 100755 (executable)
index 0000000..6a56196
--- /dev/null
+++ b/src/modules/mvsp/configure
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ "$help" != "1" ]
+then
+       echo "- pending move to melted: disabling"
+       touch ../disable-mvsp
+fi

diff --git a/src/modules/valerie/consumer_valerie.c b/src/modules/mvsp/consumer_mvsp.c
similarity index 100%
rename from src/modules/valerie/consumer_valerie.c
rename to src/modules/mvsp/consumer_mvsp.c

diff --git a/src/modules/valerie/factory.c b/src/modules/mvsp/factory.c
similarity index 100%
rename from src/modules/valerie/factory.c
rename to src/modules/mvsp/factory.c

diff --git a/src/modules/xml/Makefile b/src/modules/xml/Makefile
index 2ab4ed84ddb7d3443c31d82053b7cd66b3b53d84..617c90d21bb39573261b0eb559561d5ab6a0e0d9 100644 (file)
--- a/src/modules/xml/Makefile
+++ b/src/modules/xml/Makefile
@@ -1,16 +1,16 @@
 include ../../../config.mak
 
-TARGET = ../libmltwestley$(LIBSUF)
+TARGET = ../libmltxml$(LIBSUF)
 
 OBJS = factory.o \
-          consumer_westley.o \
-          producer_westley.o
+          consumer_xml.o \
+          producer_xml.o
 
 CFLAGS += -I../..
-CFLAGS += `xml2-config --cflags`
+CFLAGS += `pkg-config libxml-2.0 --cflags`
 
 LDFLAGS += -L../../framework -lmlt
-LDFLAGS += `xml2-config --libs`
+LDFLAGS += `pkg-config libxml-2.0 --libs`
 
 SRCS := $(OBJS:.o=.c)
 
@@ -30,7 +30,8 @@ clean:
 
 install: all
        install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -m 644 westley.dtd "$(DESTDIR)$(prefix)/share/mlt"
+       install -d "$(DESTDIR)$(prefix)/share/mlt/xml"
+       install -m 644 mlt-xml.dtd "$(DESTDIR)$(prefix)/share/mlt/xml"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/xml/configure b/src/modules/xml/configure
index 53aacd25fa97b5384758bf276492264e35080656..f2dba7613e9e2d11b2e0a271df7ef2f70b4a7054 100755 (executable)
--- a/src/modules/xml/configure
+++ b/src/modules/xml/configure
@@ -3,14 +3,13 @@
 if [ "$help" != "1" ]
 then
 
-       which xml2-config > /dev/null 2>&1
+       pkg-config libxml-2.0 > /dev/null 2>&1
        disable_xml2=$?
 
        if [ "$disable_xml2" != "0" ]
        then
-               echo "- xml2 not found: disabling westley modules"
-               touch ../disable-westley
+               echo "- xml2 not found: disabling xml module"
+               touch ../disable-xml
        fi
        exit 0
 fi
-