| 1 |
aballier 09/01/12 22:09:12 |
| 2 |
|
| 3 |
Added: mlt++-0.3.4-asneeded.patch |
| 4 |
Log: |
| 5 |
version bump |
| 6 |
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-libs/mlt++/files/mlt++-0.3.4-asneeded.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mlt++/files/mlt++-0.3.4-asneeded.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mlt++/files/mlt++-0.3.4-asneeded.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mlt++-0.3.4-asneeded.patch |
| 15 |
=================================================================== |
| 16 |
Index: mlt++-0.3.4/configure |
| 17 |
=================================================================== |
| 18 |
--- mlt++-0.3.4.orig/configure |
| 19 |
+++ mlt++-0.3.4/configure |
| 20 |
@@ -38,13 +38,13 @@ case $targetos in |
| 21 |
echo LIBSUF=.dylib |
| 22 |
echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC `pkg-config --cflags mlt-framework`" |
| 23 |
echo "LIBFLAGS=-dynamiclib -single_module" |
| 24 |
- echo "LDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs` `pkg-config mlt-valerie --libs`" |
| 25 |
+ echo "OURLDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs` `pkg-config mlt-valerie --libs`" |
| 26 |
;; |
| 27 |
Linux|FreeBSD) |
| 28 |
echo LIBSUF=.so |
| 29 |
echo "CXXFLAGS+=-pthread -Wall -fPIC `pkg-config --cflags mlt-framework`" |
| 30 |
echo "LIBFLAGS=-shared" |
| 31 |
- echo "LDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs`" |
| 32 |
+ echo "OURLDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs`" |
| 33 |
;; |
| 34 |
esac >> config.mak |
| 35 |
|
| 36 |
Index: mlt++-0.3.4/src/Makefile |
| 37 |
=================================================================== |
| 38 |
--- mlt++-0.3.4.orig/src/Makefile |
| 39 |
+++ mlt++-0.3.4/src/Makefile |
| 40 |
@@ -43,7 +43,7 @@ HEADERS = config.h Mlt.h $(OBJS:.o=.h) |
| 41 |
all: $(TARGET) |
| 42 |
|
| 43 |
$(TARGET): $(OBJS) |
| 44 |
- $(CXX) $(LIBFLAGS) -o $@ $(OBJS) $(LDFLAGS) |
| 45 |
+ $(CXX) $(LIBFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(OURLDFLAGS) |
| 46 |
ln -sf $(TARGET) $(NAME) |
| 47 |
ln -sf $(TARGET) $(SONAME) |
| 48 |
|
| 49 |
Index: mlt++-0.3.4/test/Makefile |
| 50 |
=================================================================== |
| 51 |
--- mlt++-0.3.4.orig/test/Makefile |
| 52 |
+++ mlt++-0.3.4/test/Makefile |
| 53 |
@@ -1,16 +1,19 @@ |
| 54 |
include ../config.mak |
| 55 |
|
| 56 |
CXXFLAGS+=-Wall -g `pkg-config mlt-framework --cflags` -I ../src |
| 57 |
-LDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `pkg-config mlt-framework --libs` |
| 58 |
+OURLDFLAGS+=-lmlt++ -lmiracle -lvalerie `pkg-config mlt-framework --libs` |
| 59 |
+LDFLAGS+=-L../src |
| 60 |
CC=c++ |
| 61 |
|
| 62 |
all: play server |
| 63 |
|
| 64 |
play: play.o |
| 65 |
+ $(CC) $(LDFLAGS) -o $@ play.o $(OURLDFLAGS) |
| 66 |
|
| 67 |
play.o: play.cpp |
| 68 |
|
| 69 |
server: server.o |
| 70 |
+ $(CC) $(LDFLAGS) -o $@ server.o $(OURLDFLAGS) |
| 71 |
|
| 72 |
server.o: server.cpp |
Archives