Fix the build afer the reorg.

Signed-off-by: Dan Dennedy <[email protected]>

.gitignore

@@ -4,3 +4,5 @@
 config.mak
 config.h
 .depend
+*~
+

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; \

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

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}

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

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
 

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)\"

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

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"

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

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

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 );

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"

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../..
 

src/modules/valerie/Makefile → 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)