Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1c12569d038d032e1116029a482bf6bf7c8b2f71)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1c12569d038d032e1116029a482bf6bf7c8b2f71)
  • Date: Sun, 4 Dec 2016 09:10:40 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 ++
kde5-apps/kxstitch/CONFIGURE | 1
kde5-apps/kxstitch/DEPENDS | 13 ++++++++++++
kde5-apps/kxstitch/DETAILS | 17 ++++++++++++++++
kde5-apps/kxstitch/HISTORY | 5 ++++
kde5-apps/kxstitch/PRE_BUILD | 3 ++
video/ffmpeg/DEPENDS | 9 +-------
video/ffmpeg/DETAILS | 4 +--
video/ffmpeg/HISTORY | 6 +++++
video/ffmpeg/PRE_BUILD | 2 -
video/ffmpeg/ffmpeg_opj2.patch | 36 -----------------------------------
video/ffmpeg/libvpx-1.5.patch | 42
-----------------------------------------
12 files changed, 52 insertions(+), 89 deletions(-)

New commits:
commit 1c12569d038d032e1116029a482bf6bf7c8b2f71
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kxstitch-2.0.0

commit defe98180d6c0916ce51d89b4373c85f03861bc9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ffmpeg: => 3.2.1

diff --git a/ChangeLog b/ChangeLog
index 7210481..a717a17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-12-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * kde5-apps/kxstitch: added - Cross stitch pattern editor
+
2016-11-27 Treeve Jelbert <treeve AT sourcemage.org>
* kde.gpg: add 8633B4EA: public key "Elvis Angelaccio
<elvis.angelaccio AT kde.org>"

diff --git a/kde5-apps/kxstitch/CONFIGURE b/kde5-apps/kxstitch/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/kde5-apps/kxstitch/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/kde5-apps/kxstitch/DEPENDS b/kde5-apps/kxstitch/DEPENDS
new file mode 100755
index 0000000..4dfd7ab
--- /dev/null
+++ b/kde5-apps/kxstitch/DEPENDS
@@ -0,0 +1,13 @@
+source $GRIMOIRE/KDE5_DEPENDS &&
+depends qtx11extras &&
+depends kcompletion &&
+depends kconfig &&
+depends kconfigwidgets &&
+depends kdoctools &&
+depends ki18n &&
+depends kio &&
+depends ktextwidgets &&
+depends kwidgetsaddons &&
+depends kxmlgui &&
+depends imagemagick &&
+depends shared-mime-info
diff --git a/kde5-apps/kxstitch/DETAILS b/kde5-apps/kxstitch/DETAILS
new file mode 100755
index 0000000..ad26af5
--- /dev/null
+++ b/kde5-apps/kxstitch/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=kxstitch
+ VERSION=2.0.0
+
SOURCE_HASH=sha512:0ce9ec517659fd9a3163671cdb32d451487aa812355c9abb38cf143192ed49e3e32afc003a0064e9a63303b5de40d8859f92066d886dc06c6d1fe03c8790122f
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_URL=http://download.kde.org/stable/$SPELL/$VERSION/src/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=https://userbase.kde.org/KXStitch
+ ENTERED=20160821
+ KEYWORDS="images kde"
+SHORT="cross stitch pattern editoe"
+cat << EOF
+KXStitch is a program that lets you create cross stitch patterns and charts.
Patterns can be created from scratch on a user
+defined size of grid, which can be enlarged or reduced in size as your
pattern progresses. Alternatively you can import
+images from many graphics file formats which will allow you to reduce the
number of colors and to restrict the conversion to
+full stitches or optionally use fractional stitches. You may also use images
as backgrounds allowing you to trace over them.
+These imported images can then be modified using the supplied tools to
produce your final design.
+EOF
diff --git a/kde5-apps/kxstitch/HISTORY b/kde5-apps/kxstitch/HISTORY
new file mode 100644
index 0000000..fe03aaf
--- /dev/null
+++ b/kde5-apps/kxstitch/HISTORY
@@ -0,0 +1,5 @@
+2016-12-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.0
+
+2016-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version kf5
diff --git a/kde5-apps/kxstitch/PRE_BUILD b/kde5-apps/kxstitch/PRE_BUILD
new file mode 100755
index 0000000..d0ea6d7
--- /dev/null
+++ b/kde5-apps/kxstitch/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/update_xdg_mimetypes/D' CMakeLists.txt
diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 6edcc5d..0ada5f5 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -189,16 +189,11 @@ optional_depends xvid \
"" \
"for xvid support" &&

-optional_depends sdl \
+optional_depends sdl2 \
"" \
- "--disable-ffplay" \
+ "--disable-sdl2" \
"for ffplay video player" &&

-optional_depends faac \
- "--enable-libfaac" \
- "" \
- "for AAC encoding via libfaac
(${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}) support" &&
-
optional_depends opencore-amr \
"--enable-libopencore-amrnb" \
"" \
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 3b44bb0..8163d9b 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,12 +1,12 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=3.1.3
+ VERSION=3.2.1
SECURITY_PATCH=16
else
VERSION=0.7.16
SECURITY_PATCH=11
fi
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index a32882d..1bd776d 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,9 @@
+2016-12-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.2.1
+ * DEPENDS: sdl => sdl2, delete faac
+ * ffmpeg_opj2.patch: deleted
+ * PRE_BUILD: adjust
+
2016-09-21 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: corrected selection for program disabling

diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index b0f74b9..db36624 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -3,8 +3,6 @@ cd $SOURCE_DIRECTORY &&

if [[ $FFMPEG_RELEASE == legacy ]]; then
patch -p0 < "$SPELL_DIRECTORY/freetype.patch"
-else
- patch -p1 < "$SPELL_DIRECTORY/ffmpeg_opj2.patch"
fi &&

#fix bad pkg-config files
diff --git a/video/ffmpeg/ffmpeg_opj2.patch b/video/ffmpeg/ffmpeg_opj2.patch
deleted file mode 100644
index 11e66b4..0000000
--- a/video/ffmpeg/ffmpeg_opj2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -rupN ffmpeg-3.1.1/configure ffmpeg-3.1.1-new/configure
---- ffmpeg-3.1.1/configure 2016-06-27 01:54:28.000000000 +0200
-+++ ffmpeg-3.1.1-new/configure 2016-07-27 22:25:36.585141648 +0200
-@@ -5669,7 +5669,7 @@ enabled libopencv && { check_hea
- require opencv opencv2/core/core_c.h
cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
- require_pkg_config opencv opencv/cxcore.h
cvCreateImageHeader; }
- enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h
WelsGetCodecVersion
--enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h
opj_version -lopenjp2 -DOPJ_STATIC ||
-+enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h
opj_version -lopenjp2 ||
- check_lib openjpeg-2.0/openjpeg.h
opj_version -lopenjp2 -DOPJ_STATIC ||
- check_lib openjpeg-1.5/openjpeg.h
opj_version -lopenjpeg -DOPJ_STATIC ||
- check_lib openjpeg.h opj_version -lopenjpeg
-DOPJ_STATIC ||
-diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegdec.c
ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c
---- ffmpeg-3.1.1/libavcodec/libopenjpegdec.c 2016-06-27 01:54:29.000000000
+0200
-+++ ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c 2016-07-27
22:25:45.509327071 +0200
-@@ -24,8 +24,6 @@
- * JPEG 2000 decoder using libopenjpeg
- */
-
--#define OPJ_STATIC
--
- #include "libavutil/common.h"
- #include "libavutil/imgutils.h"
- #include "libavutil/intreadwrite.h"
-diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegenc.c
ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c
---- ffmpeg-3.1.1/libavcodec/libopenjpegenc.c 2016-06-27 01:54:29.000000000
+0200
-+++ ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c 2016-07-27
22:25:40.298218807 +0200
-@@ -24,8 +24,6 @@
- * JPEG 2000 encoder using libopenjpeg
- */
-
--#define OPJ_STATIC
--
- #include "libavutil/avassert.h"
- #include "libavutil/common.h"
- #include "libavutil/imgutils.h"
diff --git a/video/ffmpeg/libvpx-1.5.patch b/video/ffmpeg/libvpx-1.5.patch
deleted file mode 100644
index e8c2128..0000000
--- a/video/ffmpeg/libvpx-1.5.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001
-From: James Zern <jzern AT google.com>
-Date: Mon, 19 Oct 2015 22:44:11 -0700
-Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings
-
-VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
-from libvpx and the remaining values were never used here
-
-Reviewed-by: Michael Niedermayer <michael AT niedermayer.cc>
-Signed-off-by: James Zern <jzern AT google.com>
----
- libavcodec/libvpxenc.c | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
-index 5f39783..992122c 100644
---- a/libavcodec/libvpxenc.c
-+++ b/libavcodec/libvpxenc.c
-@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
-
- /** String mappings for enum vp8e_enc_control_id */
- static const char *const ctlidstr[] = {
-- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
-- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
-- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
-- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
-- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
-- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
- [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
- [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
- [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
-- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
- [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
- [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
-- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
- [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
- [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
- [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",
---
-1.7.10.4
-
-



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1c12569d038d032e1116029a482bf6bf7c8b2f71), Treeve Jelbert, 12/04/2016

Archive powered by MHonArc 2.6.24.

Top of Page