diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-11-17 14:59:43 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-11-17 14:59:43 +0000 |
commit | 974edc3789a5bcf4a3f7919afced6ba777ae6f53 (patch) | |
tree | f94e34d187135247344c5511bd5f322eb8e889df /media-plugins/kipi-plugins | |
parent | Masked KDE3 pkg (diff) | |
download | historical-974edc3789a5bcf4a3f7919afced6ba777ae6f53.tar.gz historical-974edc3789a5bcf4a3f7919afced6ba777ae6f53.tar.bz2 historical-974edc3789a5bcf4a3f7919afced6ba777ae6f53.zip |
old
Diffstat (limited to 'media-plugins/kipi-plugins')
3 files changed, 0 insertions, 233 deletions
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-default_chroma_opt.patch b/media-plugins/kipi-plugins/files/kipi-plugins-default_chroma_opt.patch deleted file mode 100644 index c25b86c8cc2d..000000000000 --- a/media-plugins/kipi-plugins/files/kipi-plugins-default_chroma_opt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kipi-plugins/mpegencoder/images2mpg.old 2008-06-29 16:58:31.000000000 +0200 -+++ kipi-plugins/mpegencoder/images2mpg 2008-06-29 16:58:53.000000000 +0200 -@@ -210,7 +210,7 @@ - VIDEO_TYPE="PAL" - - #Default Chroma subsampling mode (ppmtoy4m) --PPMTOY4M_CHROMA_OPT="" -+PPMTOY4M_CHROMA_OPT="-S 420mpeg2" - - # Default verbosity level . - # 0 -> Just the error messages or warnings. diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-libgpod-0.7.patch b/media-plugins/kipi-plugins/files/kipi-plugins-libgpod-0.7.patch deleted file mode 100644 index 9c5df951cf99..000000000000 --- a/media-plugins/kipi-plugins/files/kipi-plugins-libgpod-0.7.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- branches/extragear/kde3/libs/kipi-plugins/configure.in.bot 2009/01/31 14:25:40 919106 -+++ branches/extragear/kde3/libs/kipi-plugins/configure.in.bot 2009/01/31 14:27:58 919107 -@@ -124,7 +124,7 @@ - if test "x$have_libgpod" != "xyes"; then - echo "-- libgpod found.................. NO" - echo "" -- echo "iPodExport plugin needs the libgpod library, version 0.4.2 or greater. This plugin will not be compiled!" -+ echo "iPodExport plugin needs the libgpod library, version 0.7.0 or greater. This plugin will not be compiled!" - echo "To complile this plugin, please install libgpod development package." - echo "libgpod website is at http://gtkpod.org/libgpod.html" - echo "" -@@ -132,8 +132,18 @@ - else - echo "-- libgpod found.................. YES" - fi -+ if test "x$have_gdk" != "xyes"; then -+ echo "-- gdk found...................... NO" -+ echo "" -+ echo "iPodExport plugin needs the GDK (GTK+ Drawing Kit) library, the part of GTK2. This plugin will not be compiled!" -+ echo "To complile this plugin, please install GDK development package." -+ echo "" -+ all_tests=bad -+ else -+ echo "-- GDK found...................... YES" -+ fi - else -- echo "-- libgpod library......... NOT NEEDED" -+ echo "-- libgpod and gdk library......... NOT NEEDED" - fi - - echo "" - ---- branches/extragear/kde3/libs/kipi-plugins/configure.in.in 2009/01/31 14:25:40 919106 -+++ branches/extragear/kde3/libs/kipi-plugins/configure.in.in 2009/01/31 14:27:58 919107 -@@ -234,7 +234,7 @@ - KIPI_PLUGIN_PRE([htmlexport], [HTML Gallery], [xslt]) - #KIPI_PLUGIN_PRE([imagesgallery], [Images Gallery]) # ??? - KIPI_PLUGIN_PRE([imageviewer], [Viewer], [opengl]) --KIPI_PLUGIN_PRE([ipodexport], [iPod Export], [libgpod]) -+KIPI_PLUGIN_PRE([ipodexport], [iPod Export], [libgpod] [gdk]) - KIPI_PLUGIN_PRE([jpeglossless], [JPEG Lossless]) # Does it depend on tiff? - KIPI_PLUGIN_PRE([kameraklient], [Kamera Klient], [gphoto]) - KIPI_PLUGIN_PRE([metadataedit], [Metadata Editor]) -@@ -329,7 +329,7 @@ - if test "x$build_libgpod" != "xno"; then - if test "$PKGCONFIGFOUND" = "yes" ; then - -- KDE_PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 >= 0.4.2 gobject-2.0, have_libgpod=yes,have_libgpod=no) -+ KDE_PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 >= 0.7.0 gobject-2.0, have_libgpod=yes,have_libgpod=no) - - if test "x$have_libgpod" = "xyes"; then - AC_DEFINE(HAVE_LIBGPOD, 1, [have libgpod]) -@@ -343,6 +343,36 @@ - else - AC_MSG_WARN([libgpod is required for the iPod export plugin.]) - fi -+ -+ fi -+fi -+ -+#------------------------------------------------------------------ -+# -+# Check for GDK - ipod export plugin -+# -+#------------------------------------------------------------------ -+ -+have_gdk=no -+ -+if test "x$build_libgpod" != "xno"; then -+ if test "$PKGCONFIGFOUND" = "yes" ; then -+ -+ KDE_PKG_CHECK_MODULES(GDK, gdk-2.0 >= 2.10.0, have_gdk=yes,have_gdk=no) -+ -+ if test "x$have_gdk" = "xyes"; then -+ AC_DEFINE(HAVE_GDK, 1, [have gdk]) -+ ac_cppflags_save=$CPPFLAGS -+ ac_cflags_save=$CFLAGS -+ ac_ldflags_save=$LDFLAGS -+ -+ CPPFLAGS="$CPPFLAGS $GDK_INCLUDES" -+ CFLAGS="$CFLAGS $GDK_CFLAGS" -+ LDFLAGS="$LDFLAGS $GDK_LIBS" -+ else -+ AC_MSG_WARN([GDK is required for the iPod export plugin.]) -+ fi -+ - fi - fi - ---- branches/extragear/kde3/libs/kipi-plugins/ipodexport/Makefile.am 2009/01/31 14:25:40 919106 -+++ branches/extragear/kde3/libs/kipi-plugins/ipodexport/Makefile.am 2009/01/31 14:27:58 919107 -@@ -2,6 +2,7 @@ - INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) \ - $(LIBKIPI_CFLAGS) \ - $(LIBGPOD_CFLAGS) \ -+ $(GDK_CFLAGS) \ - $(all_includes) - - METASOURCES = AUTO -@@ -17,7 +18,7 @@ - - kipiplugin_ipodexport_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) - --kipiplugin_ipodexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIBGPOD_LIBS) $(all_libraries) -+kipiplugin_ipodexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIBGPOD_LIBS) $(GDK_LIBS) $(all_libraries) - - kde_services_DATA = kipiplugin_ipodexport.desktop - ---- branches/extragear/kde3/libs/kipi-plugins/ipodexport/ipodexportdialog.cpp 2009/01/31 14:25:40 919106 -+++ branches/extragear/kde3/libs/kipi-plugins/ipodexport/ipodexportdialog.cpp 2009/01/31 14:27:58 919107 -@@ -47,6 +47,10 @@ - #include <libkipi/imagedialog.h> - #endif - -+extern "C" { -+#include <gdk-pixbuf/gdk-pixbuf.h> -+} -+ - #define debug() kdDebug() - - using namespace IpodExport; -@@ -344,9 +348,13 @@ - return; - - Itdb_Artwork *artwork = item->artwork(); -- Itdb_Thumb *thumb = itdb_artwork_get_thumb_by_type( artwork, ITDB_THUMB_PHOTO_SMALL ); -+ GdkPixbuf *gpixbuf = NULL; -+ -+ // First arg in itdb_artwork_get_pixbuf(...) is pointer to Itdb_Device struct, -+ // in kipiplugin-ipodexport it is m_itdb->device. i hope it _is_ initialiezed -+ gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_itdb->device, artwork, -1, -1 ); - -- if( !thumb ) -+ if( !gpixbuf ) - { - debug() << "no thumb was found" << endl; - return; -@@ -361,6 +369,9 @@ - // QPixmap pix; - // pix.convertFromImage( image ); - // m_ipodPreview->setPixmap( pix ); -+ -+ // memory release -+ gdk_pixbuf_unref ( gpixbuf ); - } - - void - diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild deleted file mode 100644 index 246cdc6e2691..000000000000 --- a/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild,v 1.8 2009/09/06 17:48:10 ssuominen Exp $ - -EAPI=2 - -ARTS_REQUIRED="never" - -inherit kde eutils - -MY_P="${P/_/-}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Plugins for the KDE Image Plugin Interface (libkipi)." -HOMEPAGE="http://www.kipi-plugins.org/" -SRC_URI="mirror://sourceforge/kipi/${MY_P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc sparc x86" -IUSE="calendar opengl gphoto2 ipod tiff" - -DEPEND="calendar? ( || ( kde-base/libkcal:3.5 kde-base/kdepim:3.5 ) ) - >=media-libs/libkipi-0.1.5 - >=media-libs/libkexiv2-0.1.5 - >=media-libs/libkdcraw-0.1.4 - gphoto2? ( >=media-libs/libgphoto2-2.3.1 ) - >=media-libs/imlib2-1.1.0[X] - opengl? ( x11-libs/qt:3[opengl] ) - tiff? ( >=media-libs/tiff-3.6 ) - >=dev-libs/libxslt-1.1 - ipod? ( >=media-libs/libgpod-0.7.0[gtk] )" -RDEPEND="${DEPEND} - >=media-gfx/imagemagick-6.2.4 - >=media-video/mjpegtools-1.6.0 - media-sound/vorbis-tools - media-sound/mpg123" - -need-kde 3.5 - -LANGS="ar be br ca cs cy da de el en_GB es et fi fr ga gl - hu is it ja lt ms mt nb nds nl nn pa pl pt pt_BR - ru rw sk sr sr@Latn sv ta th tr uk zh_CN" - -for X in ${LANGS} ; do - IUSE="${IUSE} linguas_${X}" -done - -src_unpack() { - kde_src_unpack - - # remove configure script to trigger its rebuild during kde_src_compile - rm -f "${S}"/configure - - # Set default for the -S option for images2mpeg to work correctly, bug #208133 - epatch \ - "${FILESDIR}/${PN}-default_chroma_opt.patch" \ - "${FILESDIR}/${PN}-libgpod-0.7.patch" - - cd "${WORKDIR}/${P}/po" - for X in ${LANGS} ; do - use linguas_${X} || rm -f "${X}."* - done -} - -src_compile() { - myconf="$(use_enable calendar) - $(use_enable gphoto2 kameraklient) - $(use_enable ipod ipodexport) - $(use_enable tiff acquireimages) - $(use_enable tiff rawconverter) - $(use_enable opengl imageviewer)" - kde_src_compile all -} |