diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-12-08 21:22:58 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-12-08 21:22:58 +0000 |
| commit | 77f23d9e058eef5dccd2cdab8a34e472dde56d4d (patch) | |
| tree | 1d43e2508ac65a907e20fdd6dc1c8e50843bde22 /media-gfx/gmic | |
| parent | Version bump. Adjust version numbering to make tracking upstream versions sim... (diff) | |
| download | gentoo-2-77f23d9e058eef5dccd2cdab8a34e472dde56d4d.tar.gz gentoo-2-77f23d9e058eef5dccd2cdab8a34e472dde56d4d.tar.bz2 gentoo-2-77f23d9e058eef5dccd2cdab8a34e472dde56d4d.zip | |
Don't build example library (fixes bug #446460).
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'media-gfx/gmic')
| -rw-r--r-- | media-gfx/gmic/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/gmic/files/gmic-1.5.2.2-makefile.patch | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog index a7d1268728b5..90fb82bdae59 100644 --- a/media-gfx/gmic/ChangeLog +++ b/media-gfx/gmic/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/gmic # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.28 2012/12/08 08:37:20 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.29 2012/12/08 21:22:57 radhermit Exp $ + + 08 Dec 2012; Tim Harder <radhermit@gentoo.org> + files/gmic-1.5.2.2-makefile.patch: + Don't build example library (fixes bug #446460). 08 Dec 2012; Tim Harder <radhermit@gentoo.org> -files/gmic-1.5.0.7-ffmpeg.patch, -files/gmic-1.5.1.7-makefile.patch, diff --git a/media-gfx/gmic/files/gmic-1.5.2.2-makefile.patch b/media-gfx/gmic/files/gmic-1.5.2.2-makefile.patch index c93c639fdaf1..a8a63d625275 100644 --- a/media-gfx/gmic/files/gmic-1.5.2.2-makefile.patch +++ b/media-gfx/gmic/files/gmic-1.5.2.2-makefile.patch @@ -83,7 +83,15 @@ solaris: $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic -@@ -346,7 +332,6 @@ +@@ -337,7 +323,6 @@ + ar rcs libgmic.a gmic_lib.o + ifneq ($(OS),Darwin) + $(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LDFLAGS) +- $(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(FFTW_LDFLAGS) + else + $(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS) + endif +@@ -346,7 +331,6 @@ $(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp -Dgmic_float_only gmic_gimp : gmic_gimp.o gmic_gimp.cpp $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS) @@ -91,7 +99,7 @@ gmic_minimal: gmic.cpp $(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS) -@@ -371,7 +356,6 @@ +@@ -371,7 +355,6 @@ $(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double gmic_gmic: gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o gmic_def.h $(CC) -o gmic gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS) |