media-plugins/kipi-plugins: Drop slot 4

Package-Manager: portage-2.3.3
This commit is contained in:
Johannes Huber
2016-12-11 20:36:28 +01:00
parent 938e22b00a
commit 0d2ff9a92e
7 changed files with 0 additions and 413 deletions

View File

@@ -1,3 +1 @@
DIST digikam-4.14.0.tar.bz2 59805228 SHA256 9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad SHA512 3029e9b67d9d055bd9aee0d6d01e87950702e026f9f44b513155946ba087ec58b300f945a035a418afae45365ed007d8db6a1a90ed1d391e5e0e4cb679168ccf WHIRLPOOL 35a3caedc9a4799f161b26b3b4df51da18a31be50a8a6da5b12a339a353755d73a47f103099087e3dc8e6926f65ae19638efea3585c86f72173a086056bf48ce
DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
DIST digikam-5.3.0.tar.xz 121417224 SHA256 b36cfa27278936d41ab5f33c99fe9ccdfd545eada3e1e32efe9f9e3fdf2c3e5c SHA512 6190944d09badec6ddac194f2029e86d0ef658e08a6a120f04c86109dc2b9d9cd2e772a900d09781b563fcd0caaff186fb5fd6cde9744ce3b4e8dcc9ff29d421 WHIRLPOOL c1c0987e23587356968484d936a0a99f10d6e6ce004ffe1f5eb4d0a42b59fc1e84ec4a03f491c91c93be172ab6b78444c684221fb515e1562cc76bcc61346158

View File

@@ -1,28 +0,0 @@
diff -ruN digikam-3.0.0.orig/extra/kipi-plugins/CMakeLists.txt digikam-3.0.0/extra/kipi-plugins/CMakeLists.txt
--- digikam-3.0.0.orig/extra/kipi-plugins/CMakeLists.txt 2013-02-07 00:52:03.000000000 +0100
+++ digikam-3.0.0/extra/kipi-plugins/CMakeLists.txt 2013-02-09 22:33:55.284100771 +0100
@@ -424,7 +424,11 @@
ADD_SUBDIRECTORY(picasawebexport)
ADD_SUBDIRECTORY(smug)
ADD_SUBDIRECTORY(printimages)
- ADD_SUBDIRECTORY(expoblending)
+
+ IF(ENABLE_expoblending)
+ ADD_SUBDIRECTORY(expoblending)
+ ENDIF(ENABLE_expoblending)
+
ADD_SUBDIRECTORY(kopete)
ADD_SUBDIRECTORY(batchprocessimages)
ADD_SUBDIRECTORY(rajceexport)
@@ -492,9 +496,9 @@
ADD_SUBDIRECTORY(mediawiki)
ENDIF(MEDIAWIKI_FOUND)
- IF(FLEX_FOUND AND BISON_FOUND)
+ IF(FLEX_FOUND AND BISON_FOUND AND ENABLE_panorama)
ADD_SUBDIRECTORY(panorama)
- ENDIF(FLEX_FOUND AND BISON_FOUND)
+ ENDIF(FLEX_FOUND AND BISON_FOUND AND ENABLE_panorama)
IF(ImageMagick_FOUND AND QTGSTREAMER_FOUND)
ADD_SUBDIRECTORY(videoslideshow)

View File

@@ -1,76 +0,0 @@
diff -u -r a/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp b/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp
--- a/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2014-12-16 09:54:40.000000000 +0200
+++ b/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2014-12-24 20:46:51.471208340 +0200
@@ -181,8 +181,8 @@
cinfo.comp_info[2].v_samp_factor = 1;
// bug #154273: use 99 compression level instead 100 to reduce output JPEG file size.
- jpeg_set_quality(&cinfo, 99, true);
- jpeg_start_compress(&cinfo, true);
+ jpeg_set_quality(&cinfo, 99, boolean (true));
+ jpeg_start_compress(&cinfo, boolean(true));
// Write ICC color profile.
if (!d->iccProfile.isEmpty())
diff -u -r a/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp b/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp
--- a/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp 2014-12-16 09:54:40.000000000 +0200
+++ b/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp 2014-12-24 20:53:06.757881558 +0200
@@ -197,10 +197,10 @@
JCOPY_OPTION copyoption = JCOPYOPT_ALL;
jpeg_transform_info transformoption;
- transformoption.perfect = false;
- transformoption.force_grayscale = false;
- transformoption.trim = false;
- transformoption.crop = false;
+ transformoption.perfect = boolean(false);
+ transformoption.force_grayscale = boolean(false);
+ transformoption.trim = boolean(false);
+ transformoption.crop = boolean(false);
struct jpeg_decompress_struct srcinfo;
struct jpeg_compress_struct dstinfo;
@@ -277,7 +277,7 @@
kp_jpeg_qiodevice_src(&srcinfo, &input_file);
jcopy_markers_setup(&srcinfo, copyoption);
- (void) jpeg_read_header(&srcinfo, true);
+ (void) jpeg_read_header(&srcinfo, boolean(true));
// First rotate - execute even if rotate is JXFORM_NONE to apply new EXIF settings
transformoption.transform = rotate;
@@ -296,10 +296,10 @@
kp_jpeg_qiodevice_dest(&dstinfo, &output_file);
// Do not write a JFIF header if previously the image did not contain it
- dstinfo.write_JFIF_header = false;
+ dstinfo.write_JFIF_header = boolean(false);
// Start compressor (note no image data is actually written here)
- dstinfo.optimize_coding = true;
+ dstinfo.optimize_coding = boolean(true);
jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
// Copy to the output file any extra markers that we want to preserve
@@ -349,7 +349,7 @@
kp_jpeg_qiodevice_src(&srcinfo, &input_file);
jcopy_markers_setup(&srcinfo, copyoption);
- (void) jpeg_read_header(&srcinfo, true);
+ (void) jpeg_read_header(&srcinfo, boolean(true));
transformoption.transform=flip;
jtransform_request_workspace(&srcinfo, &transformoption);
@@ -366,10 +366,10 @@
kp_jpeg_qiodevice_dest(&dstinfo, &output_file);
// Do not write a JFIF header if previously the image did not contain it
- dstinfo.write_JFIF_header = false;
+ dstinfo.write_JFIF_header = boolean(false);
// Start compressor (note no image data is actually written here)
- dstinfo.optimize_coding = true;
+ dstinfo.optimize_coding = boolean(true);
jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
// Copy to the output file any extra markers that we want to preserve

View File

@@ -1,24 +0,0 @@
diff -ruN digikam-4.6.0.orig/extra/kipi-plugins/CMakeLists.txt digikam-4.6.0/extra/kipi-plugins/CMakeLists.txt
--- digikam-4.6.0.orig/extra/kipi-plugins/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100
+++ digikam-4.6.0/extra/kipi-plugins/CMakeLists.txt 2014-12-21 21:50:39.901188497 +0100
@@ -370,7 +370,11 @@
add_subdirectory(picasawebexport)
add_subdirectory(smug)
add_subdirectory(printimages)
+
+ if(ENABLE_expoblending)
add_subdirectory(expoblending)
+ endif()
+
add_subdirectory(kopete)
add_subdirectory(batchprocessimages)
add_subdirectory(rajceexport)
@@ -451,7 +455,7 @@
add_subdirectory(mediawiki)
endif()
- if(FLEX_FOUND AND BISON_FOUND)
+ if(FLEX_FOUND AND BISON_FOUND AND ENABLE_panorama)
add_subdirectory(panorama)
endif()

View File

@@ -1,145 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
#
# TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress
#
EAPI=5
OPENGL_REQUIRED="optional"
KDE_HANDBOOK="optional"
KDE_LINGUAS="ar be bg bs ca cs da de el en_GB eo es et eu fi fr ga gl he hi hr
hu id is it ja km ko lt lv ms nb nds nl nn oc pa pl pt pt_BR ro ru se sk sl sq
sv th tr uk zh_CN zh_TW"
inherit flag-o-matic kde4-base
MY_PV=${PV/_/-}
MY_P="digikam-${MY_PV}"
DESCRIPTION="Plugins for the KDE Image Plugin Interface"
HOMEPAGE="http://www.digikam.org/"
SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
KEYWORDS="~amd64 ~x86"
SLOT="4"
IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki panorama redeyes scanner upnp videoslideshow vkontakte"
COMMONDEPEND="
$(add_kdebase_dep kdelibs '' 4.14.14)
kde-apps/libkipi:4
kde-apps/libkdcraw:4=
kde-apps/libkexiv2:4=
dev-libs/expat
dev-libs/kqoauth
dev-libs/libxml2
dev-libs/libxslt
dev-libs/qjson
dev-qt/qtxmlpatterns:4
gpssync? ( kde-apps/libkgeomap:4 )
media-libs/libpng:0=
media-libs/tiff:0
virtual/jpeg:0
calendar? ( $(add_kdeapps_dep kdepimlibs) )
crypt? ( app-crypt/qca:2[qt4(+)] )
ipod? (
media-libs/libgpod
x11-libs/gtk+:2
)
mediawiki? ( >=net-libs/libmediawiki-3.0.0:4 )
opengl? (
media-libs/phonon[qt4]
x11-libs/libXrandr
)
redeyes? ( media-libs/opencv:=[contrib(+)] )
scanner? (
$(add_kdeapps_dep libksane)
media-gfx/sane-backends
)
upnp? ( media-libs/herqq )
videoslideshow? (
>=media-libs/qt-gstreamer-0.9.0[qt4(+)]
|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
)
vkontakte? ( >=net-libs/libkvkontakte-4.12.0:4 )
"
DEPEND="${COMMONDEPEND}
sys-devel/gettext
panorama? (
sys-devel/bison
sys-devel/flex
)
"
RDEPEND="${COMMONDEPEND}
cdr? ( app-cdr/k3b )
expoblending? ( media-gfx/hugin )
imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
panorama? (
media-gfx/enblend
>=media-gfx/hugin-2011.0.0
)
"
S=${WORKDIR}/${MY_P}/extra/${PN}
RESTRICT=test
# bug 420203
PATCHES=(
"${FILESDIR}/${PN}-4.6.0-options.patch"
"${FILESDIR}/${PN}-4.10.0-jpeg.patch"
)
src_prepare() {
# prepare the handbook
mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
if use handbook; then
echo "add_subdirectory( doc )" >> CMakeLists.txt || die
fi
# prepare the translations
mv "${WORKDIR}/${MY_P}/po" po || die
find po -name "*.po" -and -not -name "kipiplugin*.po" -delete || die
echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
echo "add_subdirectory( po )" >> CMakeLists.txt || die
if ! use redeyes ; then
sed -i -e "/DETECT_OPENCV/d" CMakeLists.txt || die
fi
kde4-base_src_prepare
}
src_configure() {
# Remove flags -floop-block -floop-interchange
# -floop-strip-mine due to bug #305443.
filter-flags -floop-block
filter-flags -floop-interchange
filter-flags -floop-strip-mine
mycmakeargs+=(
-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
$(cmake-utils_use_with ipod GLIB2)
$(cmake-utils_use_with ipod GObject)
$(cmake-utils_use_with ipod Gdk)
$(cmake-utils_use_with ipod Gpod)
$(cmake-utils_use_with calendar KdepimLibs)
$(cmake-utils_use_with gpssync KGeoMap)
$(cmake-utils_use_with mediawiki Mediawiki)
$(cmake-utils_use_find_package redeyes OpenCV)
$(cmake-utils_use_with opengl OpenGL)
$(cmake-utils_use_with crypt QCA2)
$(cmake-utils_use_with scanner KSane)
$(cmake-utils_use_with upnp Hupnp)
$(cmake-utils_use_with vkontakte LibKVkontakte)
$(cmake-utils_use_with videoslideshow QtGStreamer)
$(cmake-utils_use_enable expoblending)
$(cmake-utils_use_enable panorama)
)
kde4-base_src_configure
}

View File

@@ -1,133 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
OPENGL_REQUIRED="optional"
KDE_MINIMAL="4.10"
KDE_LINGUAS="ar be bg bs ca cs da de el en_GB eo es et eu fi fr ga gl he hi hr
hu is it ja km ko lt lv ms nb nds nl nn oc pa pl pt pt_BR ro ru se sk sl sq sv
th tr uk zh_CN zh_TW "
KDE_HANDBOOK="optional"
inherit flag-o-matic kde4-base
MY_PV=${PV/_/-}
MY_P="digikam-${MY_PV}"
DESCRIPTION="Plugins for the KDE Image Plugin Interface"
HOMEPAGE="http://www.digikam.org/"
SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
KEYWORDS="amd64 x86"
SLOT="4"
IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki panorama redeyes scanner upnp videoslideshow vkontakte"
COMMONDEPEND="
kde-apps/libkipi:4
kde-apps/libkdcraw:4=
kde-apps/libkexiv2:4=
dev-libs/expat
dev-libs/kqoauth
dev-libs/libxml2
dev-libs/libxslt
dev-libs/qjson
gpssync? ( >=kde-apps/libkgeomap-4.2.0:4 )
media-libs/libpng:0=
media-libs/tiff
virtual/jpeg
calendar? ( $(add_kdeapps_dep kdepimlibs) )
crypt? ( app-crypt/qca:2[qt4(+)] )
ipod? (
media-libs/libgpod
x11-libs/gtk+:2
)
mediawiki? ( >=net-libs/libmediawiki-3.0.0 )
redeyes? ( >=media-libs/opencv-2.4.9 )
scanner? (
$(add_kdeapps_dep libksane)
media-gfx/sane-backends
)
upnp? ( media-libs/herqq )
videoslideshow? (
media-libs/qt-gstreamer[qt4(+)]
|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
)
vkontakte? ( net-libs/libkvkontakte )
"
DEPEND="${COMMONDEPEND}
sys-devel/gettext
panorama? (
sys-devel/bison
sys-devel/flex
)
"
RDEPEND="${COMMONDEPEND}
cdr? ( app-cdr/k3b )
expoblending? ( media-gfx/hugin )
imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
panorama? (
media-gfx/enblend
>=media-gfx/hugin-2011.0.0
)
"
S=${WORKDIR}/${MY_P}/extra/${PN}
RESTRICT=test
# bug 420203
PATCHES=(
"${FILESDIR}/${PN}-3.0.0-options.patch"
)
src_prepare() {
# prepare the handbook
mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die
if use handbook; then
echo "add_subdirectory( doc )" >> CMakeLists.txt
fi
# prepare the translations
mv "${WORKDIR}/${MY_P}/po" po || die
find po -name "*.po" -and -not -name "kipiplugin*.po" -exec rm {} +
echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
echo "add_subdirectory( po )" >> CMakeLists.txt
kde4-base_src_prepare
}
src_configure() {
# Remove flags -floop-block -floop-interchange
# -floop-strip-mine due to bug #305443.
filter-flags -floop-block
filter-flags -floop-interchange
filter-flags -floop-strip-mine
mycmakeargs+=(
$(cmake-utils_use_with ipod GLIB2)
$(cmake-utils_use_with ipod GObject)
$(cmake-utils_use_with ipod Gdk)
$(cmake-utils_use_with ipod Gpod)
$(cmake-utils_use_with calendar KdepimLibs)
$(cmake-utils_use_with gpssync KGeoMap)
$(cmake-utils_use_with mediawiki Mediawiki)
$(cmake-utils_use_with redeyes OpenCV)
$(cmake-utils_use_with opengl OpenGL)
$(cmake-utils_use_with crypt QCA2)
$(cmake-utils_use_with scanner KSane)
$(cmake-utils_use_with upnp Hupnp)
$(cmake-utils_use_with videoslideshow QtGStreamer)
$(cmake-utils_use_enable expoblending)
$(cmake-utils_use_enable panorama)
)
kde4-base_src_configure
}

View File

@@ -9,14 +9,9 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
<flag name="expoblending">Build the expoblending plugin, which requires media-gfx/hugin</flag>
<flag name="flashexport">Build the flash export plugin</flag>
<flag name="gpssync">Build the gpssync plugin, which requires kde-apps/libkgeomap and thereby marble</flag>
<flag name="mediawiki">Build the mediawiki export plugin</flag>
<flag name="panorama">Pull in dependencies needed by panorama plugin</flag>
<flag name="redeyes">Add redeyes removal support</flag>
<flag name="remotestorage">Build plugin for remote storage using network protocols such as FTP, SSH, SAMBA via <pkg>kde-frameworks/kio</pkg></flag>
<flag name="videoslideshow">Build videoslideshow plugin</flag>
<flag name="vkontakte">Build plugin for vkontakte.ru</flag>
</use>
</pkgmetadata>