From: Tim Harder Date: Thu, 8 Jan 2015 04:44:17 +0000 (+0000) Subject: Remove old. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=39219ec2fa2aef4d1a38d2f0c0d2ee119e6bacfb;p=gentoo.git Remove old. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3 --- diff --git a/media-plugins/gimp-gmic/ChangeLog b/media-plugins/gimp-gmic/ChangeLog index 22760f51ee7e..d3a04b7f0254 100644 --- a/media-plugins/gimp-gmic/ChangeLog +++ b/media-plugins/gimp-gmic/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-plugins/gimp-gmic -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.48 2014/12/08 03:23:48 radhermit Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/ChangeLog,v 1.49 2015/01/08 04:44:15 radhermit Exp $ + + 08 Jan 2015; Tim Harder -gimp-gmic-1.5.8.6.ebuild, + -gimp-gmic-1.5.9.1.ebuild, -gimp-gmic-1.5.9.2-r1.ebuild, + -files/gmic-1.5.8.4-makefile.patch, -files/gmic-1.5.9.1-makefile.patch, + -files/gmic-1.5.9.2-makefile.patch: + Remove old. *gimp-gmic-1.6.0.2-r1 (08 Dec 2014) diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest index 5380eaf32307..3c8740ec2ecd 100644 --- a/media-plugins/gimp-gmic/Manifest +++ b/media-plugins/gimp-gmic/Manifest @@ -1,28 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gmic-1.5.8.4-makefile.patch 5384 SHA256 48cd18f8e8086a21b62b59788d34185521dddfa9f42ec228f069d44aac2d7af0 SHA512 009cc63ce747ee0acd917795ff093d9aec4545105cb9a96f837d885d68f420b919557d569e2492cd016b96a723a932f8e7b19cf89f12b8ecb153b96dcf1e49b1 WHIRLPOOL 752c7849074e70f3bf10b5aa144917d9e18276c4d99a0a4b4139b217a1e8edd8036df0c95b9f7a3f3b12f03abc99e8c67666fab8365d5259e1e788096f512998 -AUX gmic-1.5.9.1-makefile.patch 5285 SHA256 75c0faee9e1fa0796ecd3583de9b81a7281be7fd80d46fede525d385f5c449c3 SHA512 71ffc20d5bc94766ed86012a3f720ab3c43fe229822ecd1325217713fcce4f4305ad34b6bb0a3fc07c1949bf0a1c581a22307b0f49a4302a58de7b3d0261de00 WHIRLPOOL df3b4b59b959e2a56ad829e2446295f6434a13c210d7c83b9dd173e54baf495dddbd71bfe3531670737ebe0769239e1a873635a11439f7cdf94b71ed3029aede -AUX gmic-1.5.9.2-makefile.patch 16211 SHA256 222a8d530aab275b376b4272fc2f7a43fdfddf51a33fa70bd031ca05899b6bb7 SHA512 2e00b93ccc980823641a1704b2684e617ca64c44c00fb4aac0373f0338192b6c768356c806cef3b9baf86d299f492eb0414b7e7f42eb3bcae5e9ab04d8fe1013 WHIRLPOOL acb02abac8d6174afdbb982c29243b0a7e723b83b2d2c538fa9c77c99e1f09400960e0e8b108a770c75c9317ada029d6f8dea7ffe8de5dd14471262a7ccded21 AUX gmic-1.6.0.2-makefile.patch 6480 SHA256 b4b0b8834d784f8464bf0e836d10cd3f1c86fb6bf5d73f129222e3c824c05bc4 SHA512 7f69f20a8fa73e4b9bdfc9c4e222d80d8a87a0d18acded10af254806464c4b45280a596722859926d7b64b560f484501335f950c6dac7eb76b7b3f7d1a3a8a8c WHIRLPOOL 5f600fe95c3b1d2a61bc7b1f4b2c65f25f0648b44ee3fe40735c6f20ecbda2e57a2f88c19577841983499d19685b3902adb5b2d4ae1006ecdc50474b172660a2 -DIST gmic_1.5.8.6.tar.gz 2691672 SHA256 21f90a37f2b63070c3d31ad19139c90d3241e62c3b1cca04eb1a5ca45838ad91 SHA512 1687fac247b922cc1d4c42821d3d79eb25e5ab6be0bf6b9b5bf026edec71ba39d2a627cfa604ae9779c49b66e12c56dae2dfdae163e5a3c13d2cf21b2ad5f3a6 WHIRLPOOL c106a7780ef1c542974a78ae2208dcd7dbf8ec714746264ee124876651b7bf3590d75c8c0fef27b3e2fd63627644da52b5572be9935209958a8aa3b5eae7edb8 -DIST gmic_1.5.9.1.tar.gz 2780328 SHA256 6ef0f700a34398c550ec8c44c53393ef222c0bf6dc998fe14b6e434069158cc9 SHA512 a0298925fca007fc95a4d892e41785050bddff4d891e996217af5110c34d550f935cdd1033338e30495fbcb27b76f16a9f201b7b4ce5eb6af2e030c61a040e85 WHIRLPOOL 7b3e9ec6a38369feea423ebf9e76787e8135a8985a164789e45493b98448f97524508d18d2ae9dd784e5b53f94e22702d0c48f871d283c5544c4f4fcd4a42a08 -DIST gmic_1.5.9.2.tar.gz 2784355 SHA256 8fffca4cf2964f75961f165e507101444da593da8a525551bc359a3e7542d3dc SHA512 f451baabfc3a4e51a9e882a970bb26551c72f3802d3c6bdf76ffe37be9dd69eeada75e02457572037124f914fbed6f96ddf0620771b6c71901a4478f38ad3e53 WHIRLPOOL 9760484589e1e84949e6059d0b681644773259ed9242dfcc43440a6bfedec75fa8e969b4e7eb74c6208b0d21a9d311a6751916850dccfd903593c4b78cc7d659 DIST gmic_1.6.0.2.tar.gz 3013936 SHA256 ec9fa41bb8c27f883b9f845258d41f8024936c80bdec723a1c67cfe05ef9b900 SHA512 9d754cc2c72835bd139a39f72863f5315bebc25716efadb023f54661a4bb3fbf29066ddcd258ab8f084164edc9bd02f77a5a801b5c0753322f959205ce0adaf1 WHIRLPOOL 1d8e7126901b7a269f0aae9bdc1bd05a859efa3269de892e712892aa0c06eeb856c27cf05564bac30abcacf27f3e11d2bcc8f179fc29a675960d6640567cdc0c -EBUILD gimp-gmic-1.5.8.6.ebuild 1113 SHA256 c480650257f4dd49519e523658c89ac5ae83a2915601d1c41e7f1a0a528623dc SHA512 8c808e7b90a263cb54801f5dbf068efc5e95897dc22aaa72d70bc67f159f16467f0692df1bfe114575300dbea182cb1c40c4fff47c743135a5626d337be461e1 WHIRLPOOL b400bac0370313be50ce2dfd4cd5970dad68d94427d35380715f8db0bdf114f405cb8c5548581f6de817c3450e6adcc4b86e82cb4e549ba04b58fc628419ee16 -EBUILD gimp-gmic-1.5.9.1.ebuild 983 SHA256 8da0414b8d231712706269fedcf920554d25a2810a6a2a91aa2a6ef936d7c7bf SHA512 7d89345b119edb94f1d026c88309f50264e1403a9c07281694e323610a432e4ed82452d8ab21d7620f599d296f5299ae981073165414f5523da9ca093d2dec4f WHIRLPOOL 3b134de3c2baa9d634fd4b1696f50aa6e3bc1c4902a6e16b31d75fe6215912925d55afd5326ab9642f5efad6914d3f9970b663c4e27d520b94e5ecbe8c751283 -EBUILD gimp-gmic-1.5.9.2-r1.ebuild 986 SHA256 3c923737b802264cc8e900962f137d3d8431ec16444401939cff4cdf6debf5ca SHA512 10ccdee6e7f0f6121526f55405f8955af5ddd31f96008015ed976b06dddd7c5c6578b422e8795054ed668b2eb9431e517387ea1350c747fd8bef7e6a693ed8eb WHIRLPOOL 577e0725171115f3c44be7f2ff98a7da4522dfd310853db2407c77a70acdec8abce8035171552bcfc04d6d0969d31ae7420ec2cfab860cafde21ecc2656af7b8 EBUILD gimp-gmic-1.6.0.2-r1.ebuild 1315 SHA256 8b45f6744aeb8fe54a568beecc441568143a0ccaa9f130624937f640b48bd4ad SHA512 b188d0268b261dd511e00cad9616ae16458f6c97d6ec402b2e1c7b3c09f04c41d275541332e96b9ff32476c474dfd83d061596772e4a038f331abdf38853e0e2 WHIRLPOOL 06e933bae7823c65b956d79f7e59aee7b9968c0402cfd2821dafa30d04532ae3dcd0c6d608d025b168d299c12d52fd2e2b5f5faef082b9eabf6d7737ba8251ac -MISC ChangeLog 7639 SHA256 badfd829845982b5dff3d8193a52dc5278e0de868c7e162bb57a59ecceaef1db SHA512 856d94978b32c31cb6e8057917f1f862f3bcbcab2da4082a5ef3424e86d0d95b0174b3f9a12e43c79c801d4d8d6c88b62af3e8f8588992dfaa32186f8d00e7f5 WHIRLPOOL ec5a2271197b1290a4edef2586dd8c3cc6cdf9e5b1633d2edc1d0019dd19b5edb9f84b53a532b8a48ed1138ef1c1f966cc4361741813dd9618d4ff614418ebcf +MISC ChangeLog 7901 SHA256 a16b25198ed46c163ab9a9575f5f2d7f00df0892db2ec164ec34cd91263909bb SHA512 b3dd76a90fafa16d06983a16e77c4f57f1b6a3131f25fd89e1ccff9bd9151906cb3c8d160268c49c57de6a0c80a7cd4f6dca543ffb70529cbeb3bb84ca85eb83 WHIRLPOOL 65084dfe97d436d9649ab9d0598fe620a0e9f573797af3c5132b85ea55c75a95f24be236da623523644a3863b7e2ae85e4667cc46053808927052a94f792159f MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUhRnQAAoJEEqz6FtPBkyj+84H/3u8zuRQOZNoduCMYdC6q+Rg -Gp/34wLRVtzv1UNt4G8j6ccUaFCR/SYgBudoc/kve9hLgOLU97vvNlwxy/hx3VAX -KiVGzj3ekM+0n099HIhdQ0kI6Q/oJIMJ6dJWIwpATaObM03ZhrVFaGmXYIpZx8lA -ytCK3ub3QgHs8igl8PG1cLk3LUTO4JSOS20mInkzW3TnnjmPKHbSbG12n9RD5Szw -/fy+6agcYTRDyjAJfvwe91YJYQ4GXlFJ9TEn8/cXzVgJXeSzwOMILa+87Jw16E8l -rGWl8I07qYuqHBvoIn8bKbQWiA2yOm2BbjkvJgQETGVBlsLE7dGeIEXz4NE9H7A= -=QA3W +iQEcBAEBCAAGBQJUrgsuAAoJEEqz6FtPBkyjmGAH/iGswSI/mFyHZkMLyQwhxQ3T +WRjKBFIcyXqi2jXpbfl6c5ELj5R/xzbOoq3+o/1MtHYWKbUtI0DIo5cetPjFgeCN +uNoJRlFP+1KTsoyP8mqciB4EHGvf29LC4qNwbjrvNWuXhKtYR6nzydKyN5bmpe2Z ++QHLwHY7Cyd4rCqK+XFvl6DnJx+3IZtisvDM7WXbhNSCagrEeiDFCEOYaauGuNPT +l2y3zwYWgWl3E+/rCU7jrn519cbsla49NgJiDLX0ULYPUBBUzTPGaXrT8MoaZfAm +5W1e/fEyYv3nbprMaSzYDnpjJgWhLSWLlHQpA0lsQ3xf1IpxC9Ww5sIp+HONr3Q= +=zBv0 -----END PGP SIGNATURE----- diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.8.4-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.8.4-makefile.patch deleted file mode 100644 index 53f511fdfba9..000000000000 --- a/media-plugins/gimp-gmic/files/gmic-1.5.8.4-makefile.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- gmic-1.5.8.4/src/Makefile -+++ gmic-1.5.8.4/src/Makefile -@@ -77,7 +77,6 @@ - - # Flags that are mandatory to compile 'gmic'. - MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include --MANDATORY_LDFLAGS += -L$(USR)/lib - ifeq ($(CC),g++) - MANDATORY_CFLAGS += -Wall -W - MANDATORY_LDFLAGS += -lm -@@ -121,14 +120,14 @@ - # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too). - # This requires the presence of the X11 include and library files. - # (package 'libx11-dev' on Debian). --X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr --X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr -+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr -+X11_LDFLAGS = -lX11 -lpthread #-lXrandr - - # Flags to enable fast display, using XShm. - # This requires the presence of the X11 extension include and library files. - # (package 'libx11-dev' on Debian). - XSHM_CFLAGS = -Dcimg_use_xshm --XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext -+XSHM_LDFLAGS = -lXext - - # Flags to enable image display, using GDI32. - # This requires the presence of the GDI32 include and library files. -@@ -163,7 +162,7 @@ - # This requires the presence of the FFMPEG include and library files. - # (packages 'libavcodec-dev', 'libavutil-dev', 'libavformat-dev' and 'libswscale-dev' on Debian). - FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I$(USR)/include/libavcodec -I$(USR)/include/libavformat -I$(USR)/include/libswscale -I$(USR)/include/ffmpeg --FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale -+FFMPEG_LDFLAGS = -lavcodec -lavformat -lavutil -lswscale - - # Flags to enable native support for compressed .cimgz files, using the Zlib library. - # This requires the presence of the Zlib include and library files. -@@ -174,14 +173,8 @@ - # Flags to enable native support of webcams, using the OpenCV library. - # This requires the presence of the OpenCV include and library files. - # (package 'libcv3-2-dev' on Debian). --ifeq ($(OS),Darwin) - OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv - OPENCV_LDFLAGS = `pkg-config opencv --libs` #-> Use this for OpenCV 2.2.0 ! --else --OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv --# OPENCV_LDFLAGS = -lcv -lhighgui --OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui #-> Use this for OpenCV >= 2.2.0 ! --endif - - # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library. - # This requires the presence of the GraphicsMagick++ include and library files. -@@ -308,10 +301,10 @@ - endif - - gimp: -- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp -+ $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp - - lib: -- $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib -+ $(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib - - zart: lib - ifneq ($(OS),Darwin) -@@ -331,13 +324,13 @@ - $(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" gmic_cli_standard - - linux: -- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_standard -+ $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_cli_standard - - linux_alltypes: - $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_alltypes - - custom: -- $(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_alltypes -+ $(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_cli_alltypes - - solaris: - $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_cli_standard -@@ -355,10 +348,9 @@ - gmic_lib.o: gmic.cpp gmic_def.h - $(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS) -Dgmic_float_only - gmic_lib: gmic_lib.o -- ar rcs libgmic.a gmic_lib.o -+ $(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 -@@ -367,7 +359,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) -- strip gmic_gimp$(EXE) - - gmic_bool.o: gmic.cpp - $(CC) -o gmic_bool.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_bool -@@ -389,7 +380,6 @@ - $(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double - gmic_cli_alltypes: 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) -- strip gmic$(EXE) - - gmic_cli_standard: gmic.cpp - $(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS) diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.9.1-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.9.1-makefile.patch deleted file mode 100644 index fd69a7c9c3ec..000000000000 --- a/media-plugins/gimp-gmic/files/gmic-1.5.9.1-makefile.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- gmic-1.5.9.1/src/Makefile -+++ gmic-1.5.9.1/src/Makefile -@@ -77,7 +77,6 @@ - - # Flags that are mandatory to compile 'gmic'. - MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include --MANDATORY_LDFLAGS += -L$(USR)/lib - ifeq ($(CC),g++) - MANDATORY_CFLAGS += -Wall -W - MANDATORY_LDFLAGS += -lm -@@ -121,14 +120,14 @@ - # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too). - # This requires the presence of the X11 include and library files. - # (package 'libx11-dev' on Debian). --X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr --X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr -+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr -+X11_LDFLAGS = -lX11 -lpthread #-lXrandr - - # Flags to enable fast display, using XShm. - # This requires the presence of the X11 extension include and library files. - # (package 'libx11-dev' on Debian). - XSHM_CFLAGS = -Dcimg_use_xshm --XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext -+XSHM_LDFLAGS = -lXext - - # Flags to enable image display, using GDI32. - # This requires the presence of the GDI32 include and library files. -@@ -163,7 +162,7 @@ - # This requires the presence of the FFMPEG include and library files. - # (packages 'libavcodec-dev', 'libavutil-dev', 'libavformat-dev' and 'libswscale-dev' on Debian). - FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I$(USR)/include/libavcodec -I$(USR)/include/libavformat -I$(USR)/include/libswscale -I$(USR)/include/ffmpeg --FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale -+FFMPEG_LDFLAGS = -lavcodec -lavformat -lavutil -lswscale - - # Flags to enable native support for compressed .cimgz files, using the Zlib library. - # This requires the presence of the Zlib include and library files. -@@ -174,14 +173,8 @@ - # Flags to enable native support of webcams, using the OpenCV library. - # This requires the presence of the OpenCV include and library files. - # (package 'libcv3-2-dev' on Debian). --ifeq ($(OS),Darwin) - OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv - OPENCV_LDFLAGS = `pkg-config opencv --libs` #-> Use this for OpenCV 2.2.0 ! --else --OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv --# OPENCV_LDFLAGS = -lcv -lhighgui --OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui #-> Use this for OpenCV >= 2.2.0 ! --endif - - # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library. - # This requires the presence of the GraphicsMagick++ include and library files. -@@ -307,10 +300,10 @@ - endif - - gimp: -- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp -+ $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp - - lib: -- $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib -+ $(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib - - zart: lib - ifneq ($(OS),Darwin) -@@ -321,7 +314,7 @@ - - # Entries for other configurations. - linux: -- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_standard -+ $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" gmic_cli_standard - - solaris: - $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_cli_standard -@@ -342,7 +335,7 @@ - $(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" gmic_cli_standard - - full: -- $(MAKE) "CFLAGS=$(FULL_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(FULL_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_full -+ $(MAKE) "CFLAGS+=$(FULL_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(FULL_UNIX_LDFLAGS)" gmic_cli_full - - winminimal: - $(MAKE) "CFLAGS=$(MINIMAL_WINDOWS_CFLAGS)" "LDFLAGS=$(MINIMAL_WINDOWS_LDFLAGS)" gmic_cli_standard -@@ -351,10 +344,9 @@ - gmic_lib.o: gmic.cpp - $(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS) -Dgmic_float_only - gmic_lib: gmic_lib.o -- ar rcs libgmic.a gmic_lib.o -+ $(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 -@@ -363,7 +355,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) -- strip gmic_gimp$(EXE) - - gmic_bool.o: gmic.cpp - $(CC) -o gmic_bool.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_bool -@@ -385,7 +376,6 @@ - $(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double - gmic_cli_full: 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 - $(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) -- strip gmic$(EXE) - gmic_cli_standard: gmic.cpp - $(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS) - diff --git a/media-plugins/gimp-gmic/files/gmic-1.5.9.2-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.5.9.2-makefile.patch deleted file mode 100644 index 6a7d99dc5146..000000000000 --- a/media-plugins/gimp-gmic/files/gmic-1.5.9.2-makefile.patch +++ /dev/null @@ -1,313 +0,0 @@ ---- gmic-1.5.9.2/src/Makefile -+++ gmic-1.5.9.2/src/Makefile -@@ -77,10 +77,9 @@ - - # Flags that are mandatory to compile 'gmic'. - MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include --MANDATORY_LDFLAGS += -L$(USR)/lib - ifeq ($(CC),g++) - MANDATORY_CFLAGS += -Wall -W --MANDATORY_LDFLAGS += -lm -+MANDATORY_LIBS = -lm - endif - MANDATORY_CFLAGS+=$(IS_BETA_CFLAGS) - ifeq ($(OS),Unix) -@@ -108,7 +107,7 @@ - ifneq ($(OS),Darwin) - PARALLEL_CFLAGS = -Dgmic_is_parallel - ifneq ($(OSTYPE),msys) --PARALLEL_LDFLAGS = -lpthread -+PARALLEL_LIBS = -lpthread - endif - endif - -@@ -121,98 +120,92 @@ - # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too). - # This requires the presence of the X11 include and library files. - # (package 'libx11-dev' on Debian). --X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr --X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr -+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr -+X11_LIBS = -lX11 -lpthread #-lXrandr - - # Flags to enable fast display, using XShm. - # This requires the presence of the X11 extension include and library files. - # (package 'libx11-dev' on Debian). - XSHM_CFLAGS = -Dcimg_use_xshm --XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext -+XSHM_LIBS = -lXext - - # Flags to enable image display, using GDI32. - # This requires the presence of the GDI32 include and library files. - GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\" --GDI32_LDFLAGS = -lgdi32 -+GDI32_LIBS = -lgdi32 - - # Flags to enable native support for PNG image files, using the PNG library. - # This requires the presence of the libpng include and library files. - # (package 'libpng12-dev' on Debian). - PNG_CFLAGS = -Dcimg_use_png --PNG_LDFLAGS = -lpng -lz -+PNG_LIBS = -lpng -lz - - # Flags to enable native support for JPEG image files, using the JPEG library. - # This requires the presence of the libjpeg include and library files. - # (package 'libjpeg62-dev' on Debian). - JPEG_CFLAGS = -Dcimg_use_jpeg --JPEG_LDFLAGS = -ljpeg -+JPEG_LIBS = -ljpeg - - # Flags to enable native support for TIFF image files, using the TIFF library. - # This requires the presence of the libtiff include and library files. - # (package 'libtiff4-dev' on Debian). - TIFF_CFLAGS = -Dcimg_use_tiff --TIFF_LDFLAGS = -ltiff -+TIFF_LIBS = -ltiff - - # Flags to enable native support for MINC2 image files, using the MINC2 library. - # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide ) - # (package 'libminc-dev' on Debian). - MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include --MINC2_LDFLAGS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib -+MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib - - # Flags to enable native support for various video files, using the FFMPEG library. - # This requires the presence of the FFMPEG include and library files. - # (packages 'libavcodec-dev', 'libavutil-dev', 'libavformat-dev' and 'libswscale-dev' on Debian). - FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I$(USR)/include/libavcodec -I$(USR)/include/libavformat -I$(USR)/include/libswscale -I$(USR)/include/ffmpeg --FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale -+FFMPEG_LIBS = -lavcodec -lavformat -lavutil -lswscale - - # Flags to enable native support for compressed .cimgz files, using the Zlib library. - # This requires the presence of the Zlib include and library files. - # (package 'zlib1g-dev' on Debian). - ZLIB_CFLAGS = -Dcimg_use_zlib --ZLIB_LDFLAGS = -lz -+ZLIB_LIBS = -lz - - # Flags to enable native support of webcams, using the OpenCV library. - # This requires the presence of the OpenCV include and library files. - # (package 'libcv3-2-dev' on Debian). --ifeq ($(OS),Darwin) --OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv --OPENCV_LDFLAGS = `pkg-config opencv --libs` #-> Use this for OpenCV 2.2.0 ! --else - OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv --# OPENCV_LDFLAGS = -lcv -lhighgui --OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui #-> Use this for OpenCV >= 2.2.0 ! --endif -+OPENCV_LIBS = `pkg-config opencv --libs` #-> Use this for OpenCV 2.2.0 ! - - # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library. - # This requires the presence of the GraphicsMagick++ include and library files. - # (package 'libgraphicsmagick++1-dev' on Debian). - MAGICK_CFLAGS = -Dcimg_use_magick -I$(USR)/include/GraphicsMagick - ifeq ($(OS),Darwin) --MAGICK_LDFLAGS = -L$(USR)/lib -lGraphicsMagick++ -lGraphicsMagick -llcms -ltiff -lfreetype -ljpeg -lpng -lbz2 -lxml2 -lz -lm -lltdl -+MAGICK_LIBS = -L$(USR)/lib -lGraphicsMagick++ -lGraphicsMagick -llcms -ltiff -lfreetype -ljpeg -lpng -lbz2 -lxml2 -lz -lm -lltdl - else --MAGICK_LDFLAGS = -lGraphicsMagick++ -+MAGICK_LIBS = -lGraphicsMagick++ - endif - - # Flags to enable native support of EXR file format, using the OpenEXR library/ - # This requires the presence of the OpenEXR include and library files. - # (package 'libopenexr-dev' on Debian). - EXR_CFLAGS = -Dcimg_use_openexr -I$(USR)/include/OpenEXR --EXR_LDFLAGS = -lIlmImf -lHalf -+EXR_LIBS = -lIlmImf -lHalf - - # Flags to enable the use of the FFTW3 library. - # This requires the presence of the FFTW3 include and library files. - # (package 'libfftw3-dev' on Debian). - FFTW_CFLAGS = -Dcimg_use_fftw3 --FFTW_LDFLAGS = -lfftw3 -lfftw3_threads -+FFTW_LIBS = -lfftw3 -lfftw3_threads - ifeq ($(OSTYPE),msys) --FFTW_LDFLAGS = -lfftw3-3 -+FFTW_LIBS = -lfftw3-3 - endif - - # Flags to enable the use of the BOARD library. - # This requires the presence of the BOARD include and library files. - # (no packages exist for Debian at this time). - BOARD_CFLAGS = -Dcimg_use_board --BOARD_LDFLAGS = -lboard -+BOARD_LIBS = -lboard - - #---------------------------------------------------------------- - # Predefined sets of flags for different default configurations. -@@ -222,21 +215,21 @@ - STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(X11_CFLAGS) $(PNG_CFLAGS) \ - $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \ - $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(XSHM_CFLAGS) $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS) --STD_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(PNG_LDFLAGS) \ -- $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \ -- $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(XSHM_LDFLAGS) $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) # $(MAGICK_LDFLAGS) -+STD_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(X11_LIBS) $(PNG_LIBS) \ -+ $(JPEG_LIBS) $(TIFF_LIBS) $(ZLIB_LIBS) \ -+ $(EXR_LIBS) $(FFTW_LIBS) # $(XSHM_LIBS) $(OPENCV_LIBS) $(FFMPEG_LIBS) # $(MAGICK_LIBS) - - # Unix : Minimal build. - MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) \ - ${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) $(CHECKIMAGE_CFLAGS) # $(OPENCV_CFLAGS) --MINIMAL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) \ -- ${TIFF_LDFLAGS} ${PNG_LDFLAGS} $(ZLIB_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS) -+MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(X11_LIBS) \ -+ ${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS) - - # Unix : Static build. - STATIC_PATH = /usr/lib/ - STATIC_EXTRA = - STATIC_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0 --STATIC_UNIX_LDFLAGS = $(PARALLEL_LDFLAGS) \ -+STATIC_UNIX_LIBS = $(PARALLEL_LIBS) \ - $(STATIC_PATH)/libpng.a \ - $(STATIC_PATH)/libjpeg.a \ - $(STATIC_PATH)/libz.a \ -@@ -246,40 +239,40 @@ - FULL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(PNG_CFLAGS) \ - $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \ - $(FFTW_CFLAGS) $(EXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(FFMPEG_CFLAGS) $(MAGICK_CFLAGS) $(BOARD_CFLAGS) $(MINC2_CFLAGS) --FULL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(PNG_LDFLAGS) \ -- $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \ -- $(FFTW_LDFLAGS) $(EXR_LDFLAGS) $(OPENCV_LDFLAGS) # $(XSHM_LDFLAGS) $(FFMPEG_LDFLAGS) $(MAGICK_LDFLAGS) $(BOARD_LDFLAGS) $(MINC2_LDFLAGS) -+FULL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(X11_LIBS) $(PNG_LIBS) \ -+ $(JPEG_LIBS) $(TIFF_LIBS) $(ZLIB_LIBS) \ -+ $(FFTW_LIBS) $(EXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) $(FFMPEG_LIBS) $(MAGICK_LIBS) $(BOARD_LIBS) $(MINC2_LIBS) - - # Windows : Standard build. - STD_WINDOWS_CFLAGS= $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(GDI32_CFLAGS) $(ZLIB_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(FFTW_CFLAGS) --STD_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(GDI32_LDFLAGS) $(ZLIB_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(FFTW_LDFLAGS) -+STD_WINDOWS_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(GDI32_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(FFTW_LIBS) - - # Windows : Minimal build. - MINIMAL_WINDOWS_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(DEBUG_CFLAGS) $(GDI32_CFLAGS) $(CHECKIMAGE_CFLAGS) --MINIMAL_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(GDI32_LDFLAGS) -+MINIMAL_WINDOWS_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(GDI32_LIBS) - - # Mac-OSX : Standard build. - STD_MACOSX_CFLAGS= $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(ZLIB_CFLAGS) $(PNG_CFLAGS) \ - $(JPEG_CFLAGS) $(TIFF_CFLAGS) \ - $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(MAGICK_CFLAGS) --STD_MACOSX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(ZLIB_LDFLAGS) \ -- $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) \ -- $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(MAGICK_LDFLAGS) -+STD_MACOSX_LIBS = $(MANDATORY_LIBS) $(X11_LIBS) $(ZLIB_LIBS) \ -+ $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) \ -+ $(EXR_LIBS) $(FFTW_LIBS) # $(MAGICK_LIBS) - - # GIMP plug-in : Standard build. - STD_GIMP_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) ${IS_BETA_CFLAGS} -Dcimg_display=0 -Dcimg_use_rng --STD_GIMP_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS) -+STD_GIMP_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(PNG_LIBS) $(ZLIB_LIBS) - ifeq ($(OSTYPE),msys) --STD_GIMP_LDFLAGS += -mwindows -lpthread -+STD_GIMP_LIBS += -mwindows -lpthread - endif - - # Libgmic : Standard build. - STD_LIB_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0 # -fno-ipa-sra --STD_LIB_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(FFTW_LDFLAGS) -+STD_LIB_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) - - # GMICol : Standard build. - GMICOL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0 --GMICOL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(ZLIB_LDFLAGS) /usr/lib/x86_64-linux-gnu/libfftw3.a /usr/lib/x86_64-linux-gnu/libfftw3_threads.a -+GMICOL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) /usr/lib/x86_64-linux-gnu/libfftw3.a /usr/lib/x86_64-linux-gnu/libfftw3_threads.a - - #-------------------------- - # Define Makefile entries. -@@ -307,63 +300,61 @@ - endif - - gimp: -- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp -+ $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_GIMP_LIBS)" gmic_gimp - - lib: -- $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib -+ $(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_LIB_LIBS)" gmic_lib - - zart: lib - ifneq ($(OS),Darwin) - cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart - else -- cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" -+ cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_MACOSX_LIBS) $(OPT_LDFLAGS)" - endif - - # Entries for other configurations. - linux: -- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_standard -+ $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" gmic_cli_standard - - solaris: -- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_cli_standard -+ $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_cli_standard - - macosx: -- $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" gmic_cli_standard -+ $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_MACOSX_LIBS) $(OPT_LDFLAGS)" gmic_cli_standard - - windows: -- $(MAKE) "CFLAGS=$(STD_WINDOWS_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_WINDOWS_LDFLAGS)" "STRIP_EXE=1" gmic_cli_standard -+ $(MAKE) "CFLAGS=$(STD_WINDOWS_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_WINDOWS_LIBS)" "STRIP_EXE=1" gmic_cli_standard - - gmicol: -- $(MAKE) "CFLAGS+=$(GMICOL_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(GMICOL_UNIX_LDFLAGS)" gmic_cli_standard -+ $(MAKE) "CFLAGS+=$(GMICOL_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(GMICOL_UNIX_LIBS)" gmic_cli_standard - - static: -- $(MAKE) "CFLAGS+=$(STATIC_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STATIC_UNIX_LDFLAGS)" gmic_cli_standard -+ $(MAKE) "CFLAGS+=$(STATIC_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STATIC_UNIX_LIBS)" gmic_cli_standard - - minimal: -- $(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" gmic_cli_standard -+ $(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LIBS=$(MINIMAL_UNIX_LIBS)" gmic_cli_standard - - full: -- $(MAKE) "CFLAGS=$(FULL_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(FULL_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_full -+ $(MAKE) "CFLAGS+=$(FULL_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(FULL_UNIX_LIBS)" gmic_cli_full - - winminimal: -- $(MAKE) "CFLAGS=$(MINIMAL_WINDOWS_CFLAGS)" "LDFLAGS=$(MINIMAL_WINDOWS_LDFLAGS)" gmic_cli_standard -+ $(MAKE) "CFLAGS=$(MINIMAL_WINDOWS_CFLAGS)" "LIBS=$(MINIMAL_WINDOWS_LIBS)" gmic_cli_standard - - # Internal rules to build compilation modules. - gmic_lib.o: gmic.cpp - $(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS) -Dgmic_float_only - gmic_lib: gmic_lib.o -- ar rcs libgmic.a gmic_lib.o -+ $(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) -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LIBS) - else -- $(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS) -+ $(CC) $(LDFLAGS) -shared -o libgmic.so gmic_lib.o $(LIBS) - endif - - gmic_gimp.o: gmic.cpp - $(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) -- strip gmic_gimp$(EXE) -+ $(CC) `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --libs` $(LIBS) - - gmic_bool.o: gmic.cpp - $(CC) -o gmic_bool.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_bool -@@ -384,10 +375,9 @@ - gmic_double.o: gmic.cpp - $(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double - gmic_cli_full: 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 -- $(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) -- strip gmic$(EXE) -+ $(CC) $(LDFLAGS) -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 $(LIBS) - gmic_cli_standard: gmic.cpp -- $(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS) -+ $(CC) $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS) -o gmic gmic.cpp $(LIBS) - - gmic_def: gmic_def.gmic - @echo "#ifndef gmic_gimp" > gmic_def.h diff --git a/media-plugins/gimp-gmic/gimp-gmic-1.5.8.6.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.8.6.ebuild deleted file mode 100644 index b93538cb40fa..000000000000 --- a/media-plugins/gimp-gmic/gimp-gmic-1.5.8.6.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/gimp-gmic-1.5.8.6.ebuild,v 1.1 2014/04/25 05:29:24 radhermit Exp $ - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="G'MIC GIMP plugin" -HOMEPAGE="http://gmic.sourceforge.net/gimp.shtml" -SRC_URI="mirror://sourceforge/gmic/gmic_${PV}.tar.gz" - -LICENSE="CeCILL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=media-gfx/gimp-2.4.0 - media-libs/libpng:0= - sci-libs/fftw:3.0[threads] - sys-libs/zlib" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/gmic-${PV}/src - -src_prepare() { - cp "${FILESDIR}"/gmic-1.5.8.4-makefile.patch "${T}"/gmic-1.5.8.4-makefile.patch || die - edos2unix "${T}"/gmic-1.5.8.4-makefile.patch - - epatch "${T}"/gmic-1.5.8.4-makefile.patch -} - -src_compile() { - emake CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= gimp -} - -src_install() { - exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins - doexe gmic_gimp - dodoc ../README -} - -pkg_postinst() { - elog "The G'MIC plugin is accessible from the menu:" - elog "Filters -> G'MIC" -} diff --git a/media-plugins/gimp-gmic/gimp-gmic-1.5.9.1.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.9.1.ebuild deleted file mode 100644 index 83bc5fb2c962..000000000000 --- a/media-plugins/gimp-gmic/gimp-gmic-1.5.9.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/gimp-gmic-1.5.9.1.ebuild,v 1.1 2014/06/06 06:12:59 radhermit Exp $ - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="G'MIC GIMP plugin" -HOMEPAGE="http://gmic.sourceforge.net/gimp.shtml" -SRC_URI="mirror://sourceforge/gmic/gmic_${PV}.tar.gz" - -LICENSE="CeCILL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=media-gfx/gimp-2.4.0 - media-libs/libpng:0= - sci-libs/fftw:3.0[threads] - sys-libs/zlib" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/gmic-${PV}/src - -src_prepare() { - epatch "${FILESDIR}"/gmic-${PV}-makefile.patch -} - -src_compile() { - emake CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= gimp -} - -src_install() { - exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins - doexe gmic_gimp - dodoc ../README -} - -pkg_postinst() { - elog "The G'MIC plugin is accessible from the menu:" - elog "Filters -> G'MIC" -} diff --git a/media-plugins/gimp-gmic/gimp-gmic-1.5.9.2-r1.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.5.9.2-r1.ebuild deleted file mode 100644 index d1b0bb8e4c39..000000000000 --- a/media-plugins/gimp-gmic/gimp-gmic-1.5.9.2-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/gimp-gmic-1.5.9.2-r1.ebuild,v 1.1 2014/06/16 07:52:20 radhermit Exp $ - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="G'MIC GIMP plugin" -HOMEPAGE="http://gmic.sourceforge.net/gimp.shtml" -SRC_URI="mirror://sourceforge/gmic/gmic_${PV}.tar.gz" - -LICENSE="CeCILL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=media-gfx/gimp-2.4.0 - media-libs/libpng:0= - sci-libs/fftw:3.0[threads] - sys-libs/zlib" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/gmic-${PV}/src - -src_prepare() { - epatch "${FILESDIR}"/gmic-${PV}-makefile.patch -} - -src_compile() { - emake CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= gimp -} - -src_install() { - exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins - doexe gmic_gimp - dodoc ../README -} - -pkg_postinst() { - elog "The G'MIC plugin is accessible from the menu:" - elog "Filters -> G'MIC" -}