Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (42156298ac317dc374fae2e05cf2d7d32f333179)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (42156298ac317dc374fae2e05cf2d7d32f333179)
  • Date: Sun, 6 Mar 2016 14:29:54 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

disk/mdadm/DETAILS | 4 +--
disk/mdadm/HISTORY | 4 +++
disk/mdadm/PRE_BUILD | 3 --
disk/mdadm/mdadm-3.3.2-gcc5-1.patch | 41
------------------------------------
video/avidemux3/DEPENDS | 6 +++++
video/avidemux3/DETAILS | 4 +--
video/avidemux3/HISTORY | 4 +++
7 files changed, 19 insertions(+), 47 deletions(-)

New commits:
commit 42156298ac317dc374fae2e05cf2d7d32f333179
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

disk/mdadm: version 3.4

commit 2bb21f4f26e426b7902a64506b693f8b5f6e521a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/avidemux3: version 2.6.10

diff --git a/disk/mdadm/DETAILS b/disk/mdadm/DETAILS
index c73d38a..769546a 100755
--- a/disk/mdadm/DETAILS
+++ b/disk/mdadm/DETAILS
@@ -1,7 +1,7 @@
SPELL=mdadm
- VERSION=3.3.2
+ VERSION=3.4
SOURCE=$SPELL-$VERSION.tar.xz
-
SOURCE_HASH=sha512:204363e41ec544ac44fa40ddf2758e31cbc1a88d7f038fa32a90b494b07be8e025be1bea8623029847ae495aabe3d1f2c503480db087d8a3dacd240003174936
+
SOURCE_HASH=sha512:5de06f3a2b83333e5346a1e858b15e76f75a13a1d5c5f2032fecc6eb167454b282e12ee111ac2abec778e058ec9554708ac317a476778328546603618e6f70f7
# SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/raid/$SPELL/$SOURCE
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index 37c0c22..96b5f70 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,7 @@
+2016-03-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.4
+ * PRE_BUILD, mdadm-3.3.2-gcc5-1.patch: remove obsolete patch
+
2015-04-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.3.2
* PRE_BUILD, mdadm-3.3.2-gcc5-1.patch: add patch from LFS to fix
diff --git a/disk/mdadm/PRE_BUILD b/disk/mdadm/PRE_BUILD
index 6da2ef5..1dc3479 100755
--- a/disk/mdadm/PRE_BUILD
+++ b/disk/mdadm/PRE_BUILD
@@ -2,5 +2,4 @@ default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
sedit 's:-Wall::' Makefile &&
sedit 's:-Wextra::' Makefile &&
-sedit 's:-Werror::' Makefile &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/mdadm-3.3.2-gcc5-1.patch
+sedit 's:-Werror::' Makefile
diff --git a/disk/mdadm/mdadm-3.3.2-gcc5-1.patch
b/disk/mdadm/mdadm-3.3.2-gcc5-1.patch
deleted file mode 100644
index 97c02b3..0000000
--- a/disk/mdadm/mdadm-3.3.2-gcc5-1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2015-04-24
-Initial Package Version: 3.3.2
-Upstream Status: uncertain
-Origin: Khem Raj
-Description: fixes build with gcc-5
-
-Found at
http://permalink.gmane.org/gmane.comp.handhelds.openembedded.core/62793
-
-Presumably, this can be replaced by sed when gcc-5 is in the book.
-
-diff -Naur mdadm-3.3.2.orig/bitmap.c mdadm-3.3.2/bitmap.c
---- mdadm-3.3.2.orig/bitmap.c 2014-08-21 11:16:56.000000000 +0100
-+++ mdadm-3.3.2/bitmap.c 2015-04-24 04:15:15.747699137 +0100
-@@ -20,7 +20,7 @@
-
- #include "mdadm.h"
-
--inline void sb_le_to_cpu(bitmap_super_t *sb)
-+static inline void sb_le_to_cpu(bitmap_super_t *sb)
- {
- sb->magic = __le32_to_cpu(sb->magic);
- sb->version = __le32_to_cpu(sb->version);
-@@ -34,7 +34,7 @@
- sb->write_behind = __le32_to_cpu(sb->write_behind);
- }
-
--inline void sb_cpu_to_le(bitmap_super_t *sb)
-+static inline void sb_cpu_to_le(bitmap_super_t *sb)
- {
- sb_le_to_cpu(sb); /* these are really the same thing */
- }
-@@ -74,7 +74,7 @@
- } bitmap_info_t;
-
- /* count the dirty bits in the first num_bits of byte */
--inline int count_dirty_bits_byte(char byte, int num_bits)
-+static inline int count_dirty_bits_byte(char byte, int num_bits)
- {
- int num = 0;
-
diff --git a/video/avidemux3/DEPENDS b/video/avidemux3/DEPENDS
index e770467..e9e1f80 100755
--- a/video/avidemux3/DEPENDS
+++ b/video/avidemux3/DEPENDS
@@ -54,6 +54,11 @@ optional_depends x264 \
"" \
"for H264 video encoding" &&

+optional_depends x265 \
+ "" \
+ "" \
+ "for HEVC support" &&
+
optional_depends freetype2 \
"" \
"" \
@@ -88,3 +93,4 @@ optional_depends sdl \
"" \
"" \
"for SDL audio/video output"
+
diff --git a/video/avidemux3/DETAILS b/video/avidemux3/DETAILS
index 769b601..f5cc496 100755
--- a/video/avidemux3/DETAILS
+++ b/video/avidemux3/DETAILS
@@ -1,12 +1,12 @@
SPELL=avidemux3
- VERSION=2.6.8
+ VERSION=2.6.10
SOURCE=${SPELL%3}_$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL%3}_$VERSION"
SOURCE_URL[0]=http://download.berlios.de/${SPELL%3}/$SOURCE
SOURCE_URL[1]=http://download2.berlios.de/${SPELL%3}/$SOURCE

SOURCE_URL[2]=http://downloads.sourceforge.net/sourceforge/${SPELL%3}/$SOURCE
WEB_SITE=http://fixounet.free.fr/avidemux/
-
SOURCE_HASH=sha512:57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0
+
SOURCE_HASH=sha512:f9414810925b2eeb0b6dc0094ac9a42809ab11274d2cd591eef753538d5719df893dc2352b85c8a1047b890bb03079678e6619af9bb25834a2428cfdae5005ef
LICENSE[0]=GPL
ENTERED=20140319
KEYWORDS="video"
diff --git a/video/avidemux3/HISTORY b/video/avidemux3/HISTORY
index 46b7f62..969a5c6 100644
--- a/video/avidemux3/HISTORY
+++ b/video/avidemux3/HISTORY
@@ -1,3 +1,7 @@
+2016-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.10
+ * DEPENDS: add optional dependency on x265
+
2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: fix qt4 path




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (42156298ac317dc374fae2e05cf2d7d32f333179), Florian Franzmann, 03/06/2016

Archive powered by MHonArc 2.6.24.

Top of Page