graphicsmagick: unsplit graphicsmagick++{,-dev}

6 years ago · f34dd074db
4 changed files with 5 additions and 9 deletions
--- a/packages/gmic/build.sh
+++ b/packages/gmic/build.sh
@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://gmic.eu
 TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing"
 TERMUX_PKG_LICENSE="CeCILL-2.1"
 TERMUX_PKG_VERSION=2.6.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=48de7045a36eb718d55b0dfd68a797380b5390af99c9737a4dfba0fb678ed2b4
 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_DEPENDS="graphicsmagick++, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib"
-TERMUX_PKG_BUILD_DEPENDS="graphicsmagick-dev"
+TERMUX_PKG_DEPENDS="graphicsmagick, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib"
 TERMUX_PKG_NO_DEVELSPLIT=yes
 TERMUX_PKG_BUILD_IN_SRC=yes

--- a/packages/graphicsmagick/build.sh
+++ b/packages/graphicsmagick/build.sh
@ -2,11 +2,13 @@ TERMUX_PKG_HOMEPAGE=http://www.graphicsmagick.org/
 TERMUX_PKG_DESCRIPTION="Collection of image processing tools"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_VERSION=1.3.31
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SHA256=096bbb59d6f3abd32b562fc3b34ea90d88741dc5dd888731d61d17e100394278
 # Bandwith limited on main ftp site, so it's asked to use sourceforge instead:
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${TERMUX_PKG_VERSION}/GraphicsMagick-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="littlecms, libtiff, freetype, libjasper, libjpeg-turbo, libpng, libbz2, libxml2, liblzma, zstd, zlib"
+TERMUX_PKG_REPLACES="graphicsmagick++"
+TERMUX_PKG_DEVPACKAGE_REPLACES="graphicsmagick++-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_func_ftime=no
 --with-fontpath=/system/fonts
--- a/packages/graphicsmagick/graphicsmagick++-dev.subpackage.sh
+++ b/packages/graphicsmagick/graphicsmagick++-dev.subpackage.sh
@ -1,3 +0,0 @@
-TERMUX_SUBPKG_INCLUDE="include/GraphicsMagick/Magick++"
-TERMUX_SUBPKG_DESCRIPTION="Development files for graphicsmagick++"
-TERMUX_SUBPKG_DEPENDS="graphicsmagick++"
--- a/packages/graphicsmagick/graphicsmagick++.subpackage.sh
+++ b/packages/graphicsmagick/graphicsmagick++.subpackage.sh
@ -1,2 +0,0 @@
-TERMUX_SUBPKG_INCLUDE="lib/libGraphicsMagick++.so"
-TERMUX_SUBPKG_DESCRIPTION="format-independent image processing - C++ shared library"