rdieter pushed to digikam (epel7). "digikam-4.2.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 18 19:43:33 UTC 2015
From c121904eb3003529f90332b97c38aae896bb1edf Mon Sep 17 00:00:00 2001
From: nucleo <nucleo at fedoraproject.org>
Date: Mon, 4 Aug 2014 21:32:30 +0300
Subject: digikam-4.2.0
diff --git a/.gitignore b/.gitignore
index 616ab78..cc8c948 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/digikam-4.0.0.tar.bz2
/digikam-4.1.0.tar.bz2
+/digikam-4.2.0.tar.bz2
diff --git a/digikam.spec b/digikam.spec
index d2ccdc9..98206bf 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,8 +5,8 @@
%endif
Name: digikam
-Version: 4.1.0
-Release: 4%{?pre}%{?dist}
+Version: 4.2.0
+Release: 1%{?pre}%{?dist}
Summary: A digital camera accessing & photo management application
License: GPLv2+
@@ -24,10 +24,6 @@ Source1: digikam-import.desktop
## upstreamable patches
## upstream patches
-# handle QtGstreamer API 1.0 in VideoSlideShow tool (Andreas Cord-Landwehr)
-# The patch autodetects whether we have QtGStreamer 0.10 or 1.x.
-# http://commits.kde.org/kipi-plugins/cbc59f1060fe4cf770d35800bbcefb1f89f882de
-Patch100: kipi-plugins-gstreamer1.patch
BuildRequires: eigen3-devel
BuildRequires: desktop-file-utils
@@ -234,11 +230,6 @@ BuildArch: noarch
%prep
%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
-# applied unconditionally, it autodetects the version of QtGStreamer to use
-pushd extra/kipi-plugins
-%patch100 -p1 -b .gstreamer1
-popd
-
# don't use bundled/old FindKipi.cmake in favor of kdelibs' version
# see http:/bugs.kde.org/307213
mv -f cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
@@ -553,6 +544,9 @@ update-desktop-database -q &> /dev/null
%changelog
+* Mon Aug 4 2014 Alexey Kurov <nucleo at fedoraproject.org> - 4.2.0-1
+- digikam-4.2.0
+
* Sun Aug 03 2014 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-4
- make kio_mtp fedora only
diff --git a/kipi-plugins-gstreamer1.patch b/kipi-plugins-gstreamer1.patch
deleted file mode 100644
index dff2dbd..0000000
--- a/kipi-plugins-gstreamer1.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-commit cbc59f1060fe4cf770d35800bbcefb1f89f882de
-Author: Gilles Caulier <caulier.gilles at gmail.com>
-Date: Thu Jul 10 09:59:49 2014 +0200
-
- apply patch to handle QtGstreamer API 1.0 in VideoSlideShow tool
- REVIEW: 119073
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb1e04c..ff42bb0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -349,6 +349,24 @@ PRINT_PLUGIN_COMPILE_STATUS("Panorama" FLEX_FOUND AND BISON_FOUND)
- PRINT_PLUGIN_COMPILE_STATUS("VideoSlideshow" ImageMagick_FOUND AND QTGSTREAMER_FOUND)
- PRINT_PLUGIN_COMPILE_STATUS("Wallpaper" BUILD_WALLPAPER)
-
-+
-+# set QtGStreamer API version
-+MESSAGE(STATUS "----------------------------------------------------------------------------------")
-+MESSAGE(STATUS "")
-+IF((${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} EQUAL 1 AND ${QtGStreamer_VERSION_PATCH} GREATER 80)
-+ OR (${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} GREATER 1))
-+ SET(GSTREAMER_API_1 TRUE)
-+ELSE((${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} EQUAL 1 AND ${QtGStreamer_VERSION_PATCH} GREATER 80)
-+ OR (${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} GREATER 1))
-+ SET(GSTREAMER_API_1 FALSE)
-+ENDIF((${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} EQUAL 1 AND ${QtGStreamer_VERSION_PATCH} GREATER 80)
-+ OR (${QtGStreamer_VERSION_MAJOR} EQUAL 1 AND ${QtGStreamer_VERSION_MINOR} GREATER 1))
-+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/gstreamerapi.h.in_cmake" "${CMAKE_CURRENT_BINARY_DIR}/gstreamerapi.h" @ONLY)
-+
-+MESSAGE(STATUS "Found QtGstreamer version : ${QtGStreamer_VERSION}")
-+MESSAGE(STATUS "Using GStreamer API 1: ${GSTREAMER_API_1}")
-+
-+
- MESSAGE(STATUS "----------------------------------------------------------------------------------")
- MESSAGE(STATUS "")
-
-diff --git a/cmake/templates/gstreamerapi.h.in_cmake b/cmake/templates/gstreamerapi.h.in_cmake
-new file mode 100644
-index 0000000..ec5a196
---- /dev/null
-+++ b/cmake/templates/gstreamerapi.h.in_cmake
-@@ -0,0 +1,6 @@
-+#ifndef GSTREAMERAPI_H
-+#define GSTREAMERAPI_H
-+
-+#cmakedefine01 GSTREAMER_API_1
-+
-+#endif
-diff --git a/videoslideshow/manager/encoderdecoder.cpp b/videoslideshow/manager/encoderdecoder.cpp
-index 23eca8a..b25ddd7 100644
---- a/videoslideshow/manager/encoderdecoder.cpp
-+++ b/videoslideshow/manager/encoderdecoder.cpp
-@@ -23,6 +23,7 @@
- * ============================================================ */
-
- #include "encoderdecoder.moc"
-+#include "../../gstreamerapi.h"
-
- // Qt includes
-
-@@ -50,6 +51,27 @@ EncoderDecoder::EncoderDecoder()
- {
- QGst::init();
-
-+#if GSTREAMER_API_1
-+ m_audioPipelines.append("filesrc location=\"%1\" ! decodebin ! audioconvert ! audioresample !"
-+ "audio/x-raw, rate=%2 ! avenc_mp2 bitrate=%3 ! queue");
-+
-+ m_audioPipelines.append("filesrc location=\"%1\" ! decodebin ! audioconvert ! audioresample !"
-+ "audio/x-raw, rate=%2 ! lamemp3enc bitrate=%3 ! id3v2mux ! queue");
-+
-+ m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert !"
-+ " y4menc ! y4mdec ! videoscale ! mpeg2enc format=%3 norm=%4 bitrate=%5 aspect=%6 ! "
-+ " filesink location=\"%7\"");
-+
-+ m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert !"
-+ " avenc_mpeg4 ! avimux ! filesink location=\"%3\"");
-+
-+ m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert !"
-+ " theoraenc ! oggmux ! filesink location=\"%3\"");
-+
-+ m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! avdec_ppm ! videoconvert ! "
-+ " avenc_mpeg4 ! queue ! mux. filesrc location =\"%3\" ! decodebin ! audioconvert !"
-+ " audio/x-raw, rate=44100 ! lamemp3enc ! queue ! mux. avimux name=mux ! filesink location=\"%4\"");
-+#else
- m_audioPipelines.append("filesrc location=\"%1\" ! decodebin ! audioconvert ! audioresample !"
- "audio/x-raw-int, rate=%2 ! ffenc_mp2 bitrate=%3 ! queue");
-
-@@ -69,6 +91,8 @@ EncoderDecoder::EncoderDecoder()
- m_videoPipelines.append("multifilesrc location=\"%1\" caps=image/ppm,framerate=%2 ! ffdec_ppm ! ffmpegcolorspace ! "
- " xvidenc ! queue ! mux. filesrc location =\"%3\" ! decodebin ! audioconvert !"
- " audio/x-raw-int, rate=44100 ! lamemp3enc ! queue ! mux. avimux name=mux ! filesink location=\"%4\"");
-+#endif
-+
- }
-
- EncoderDecoder::~EncoderDecoder()
-@@ -293,7 +317,7 @@ void EncoderDecoder::encodeVideo(const QString& destination, const QString& audi
- }
-
- /*
-- *
-+ *
- QGst::BinPtr EncoderDecoder::createAudioSrcBin(QString file, AUDIO_TYPE type, int sampleRate, int bitRate)
- {
- QGst::BinPtr audioBin;
diff --git a/sources b/sources
index 5af44af..b93c150 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a142b3f7dc81e4d0ccde6d834223cdf digikam-4.1.0.tar.bz2
+8e12775115604dd4e1d91d345781214b digikam-4.2.0.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/digikam.git/commit/?h=epel7&id=c121904eb3003529f90332b97c38aae896bb1edf
More information about the scm-commits
mailing list