sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (35e9cfe919f7a41d556626f5a6b721a243232a6f)

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 (35e9cfe919f7a41d556626f5a6b721a243232a6f)
Date: Mon, 23 May 2016 17:01:26 +0000

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

libs/sdl2/DEPENDS | 13 ++++++-------
libs/sdl2/HISTORY | 4 ++++
qt5-cmake/drumstick/BUILD | 2 ++
qt5-cmake/drumstick/DETAILS | 5 +++--
qt5-cmake/drumstick/HISTORY | 5 +++++
qt5-cmake/drumstick/PRE_BUILD | 3 ++-
qt5-cmake/drumstick/gcc6.patch | 38 ++++++++++++++++++++++++++++++++++++++
video/dvgrab/BUILD | 2 ++
video/dvgrab/HISTORY | 3 +++
9 files changed, 65 insertions(+), 10 deletions(-)

New commits:
commit 35e9cfe919f7a41d556626f5a6b721a243232a6f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dvgrab - fix for gcc-6

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

drumstick: => 1.0.2

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

sdl2 can use wayland

diff --git a/libs/sdl2/DEPENDS b/libs/sdl2/DEPENDS
index fcebaa0..45ec1e0 100755
--- a/libs/sdl2/DEPENDS
+++ b/libs/sdl2/DEPENDS
@@ -8,10 +8,6 @@ suggest_depends glibc \
"--enable-libc" "-disable-libc" \
"Use the system C library?" &&

-optional_depends nasm \
- "--enable-nasm" "--disable-nasm" \
- "for faster video overlay" &&
-
suggest_depends libx11 \
"--with-x --enable-video-x11" \
"--without-x --disable-video-x11" \
@@ -28,9 +24,6 @@ if is_depends_enabled $SPELL libx11;then
suggest_depends libxinerama \
"--enable-video-x11-xinerama"
"--disable-video-x11-xinerama" \
"Enable Xinerama support?" &&
- suggest_depends libxv \
- "--enable-video-x11-xv" "--disable-video-x11-xv" \
- "XvImage extension?" &&
suggest_depends libxcursor \
"--enable-video-x11-xcursor" "--disable-video-x11-xcursor"
\
"Enable X11 Xcursor support?" &&
@@ -74,6 +67,11 @@ optional_depends directfb \
"--enable-video-directfb" "--disable-video-directfb" \
"Use DirectFB video driver?" &&

+optional_depends wayland \
+ '--enable-video-wayland --enable-wayland-shared' \
+ '--disable-video-wayland' \
+ 'Wayland support' &&
+
suggest_depends mesalib \
"--enable-video-opengl" "--disable-video-opengl" \
"Include OpenGL support?" &&
@@ -98,3 +96,4 @@ suggest_depends tslib \
# --enable-directx use DirectX for Windows audio/video
[[default=yes]]
# --enable-render-d3d enable the Direct3D render driver [[default=yes]]

+#libxkbcommon
diff --git a/libs/sdl2/HISTORY b/libs/sdl2/HISTORY
index b81d247..dd6ff04 100644
--- a/libs/sdl2/HISTORY
+++ b/libs/sdl2/HISTORY
@@ -1,3 +1,7 @@
+2016-05-23 Treeve Jelbert <treeve AT sourceamge.org>
+ * DEPENDS: add wayland, remove nasm libxv
+ but wayland linking currently fails
+
2015-01-10 Treeve Jelbert <treeve AT sourceamge.org>
* DETAILS: version 2.0.4

diff --git a/qt5-cmake/drumstick/BUILD b/qt5-cmake/drumstick/BUILD
new file mode 100755
index 0000000..0c61d6e
--- /dev/null
+++ b/qt5-cmake/drumstick/BUILD
@@ -0,0 +1,2 @@
+CXXFLAGS+=" -std=c++03" &&
+default_build
diff --git a/qt5-cmake/drumstick/DETAILS b/qt5-cmake/drumstick/DETAILS
index 498107b..d638ecb 100755
--- a/qt5-cmake/drumstick/DETAILS
+++ b/qt5-cmake/drumstick/DETAILS
@@ -1,6 +1,6 @@
SPELL=drumstick
- VERSION=1.0.1
-
SOURCE_HASH=sha512:d1d3fd3d4d460d8c53dbd73dd449bd049f6baac653b6eaac8800d7a615881e5ef29877c82fb5e162f2612c004e2c70236206476ff4fe505fd20497f737ac1ab0
+ VERSION=1.0.2
+
SOURCE_HASH=sha512:df8d36b58e83b1e06cd1e4788e63c504bf2282c26f505509b2125e6c7be8ce8bc013774755b68e36f372a8682328459a5efb67ff09be1e0190805528458b3e45
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://sourceforge.net/projects/drumstick/files/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -16,3 +16,4 @@ provides software support for MIDI technology on Linux. A
complementary
library provides classes for processing SMF (Standard MIDI files:
.MID/.KAR),
Cakewalk (.WRK), and Overture (.OVE) file formats
EOF
+
diff --git a/qt5-cmake/drumstick/HISTORY b/qt5-cmake/drumstick/HISTORY
index 295bb02..111a5e0 100644
--- a/qt5-cmake/drumstick/HISTORY
+++ b/qt5-cmake/drumstick/HISTORY
@@ -1,3 +1,8 @@
+2016-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.2
+ * gcc6.patch: added
+ * PRE_BUILD: apply upstream patch
+
2015-11-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.1
spell created
diff --git a/qt5-cmake/drumstick/PRE_BUILD b/qt5-cmake/drumstick/PRE_BUILD
index a829301..a27a7bb 100755
--- a/qt5-cmake/drumstick/PRE_BUILD
+++ b/qt5-cmake/drumstick/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i '/update_xdg_mimetypes/D;/LIB_SUFFIX/s/64//' CMakeLists.txt
+patch -p1 <$SPELL_DIRECTORY/gcc6.patch &&
+sed -i '/update_xdg_mimetypes/D;/LIB_SUFFIX/s/64//' CMakeLists.txt
diff --git a/qt5-cmake/drumstick/gcc6.patch b/qt5-cmake/drumstick/gcc6.patch
new file mode 100644
index 0000000..ca46523
--- /dev/null
+++ b/qt5-cmake/drumstick/gcc6.patch
@@ -0,0 +1,38 @@
+Index: library/file/qove.cpp
+===================================================================
+--- a/library/file/qove.cpp (revision 316)
++++ b/library/file/qove.cpp (working copy)
+@@ -11356,7 +11356,7 @@
+ OVE::MeasureData* measureData =
d->ove.getMeasureData(i, j, k);
+ QList<OVE::MusicData*> tempoPtrs =
measureData->getMusicDatas(OVE::MusicData_Tempo);
+
+- if (k == 0 || (k > 0 &&
abs(measure->getTypeTempo() - d->ove.getMeasure(k - 1)->getTypeTempo()) >
0.01)) {
++ if (k == 0 || (k > 0 &&
std::abs(measure->getTypeTempo() - d->ove.getMeasure(k -
1)->getTypeTempo()) > 0.01)) {
+ int tick = d->mtt.getTick(k, 0);
+ int tempo = (int)
measure->getTypeTempo();
+ tempos[tick] = tempo;
+@@ -11739,7 +11739,7 @@
+ }
+ case OVE::Articulation_Arpeggio: {
+ //if( art->getChangeSoundEffect() ) {
+- unsigned int soundEffect =
abs(art->getSoundEffect().first) + abs(art->getSoundEffect().second);
++ unsigned int soundEffect =
std::abs(art->getSoundEffect().first) +
std::abs(art->getSoundEffect().second);
+ int tickAmount = (soundEffect
/ notes.size()) * ((notes.size() - i) - 1);
+ startTick -= tickAmount;
+ //}
+Index: utils/testevents/testevents.cpp
+===================================================================
+--- a/utils/testevents/testevents.cpp (revision 316)
++++ b/utils/testevents/testevents.cpp (working copy)
+@@ -262,7 +262,7 @@
+ dumpEvent(new KeyPressEvent(5, 60, 124));
+ dumpEvent(new ChanPressEvent(6, 111));
+ dumpEvent(new PitchBendEvent(7, 1234));
+- char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41,
0xf7};
++ char sysex[] = {'\xf0', '\x41', '\x10', '\x42', '\x12', '\x40', '\0',
'\x7f', '\0', '\x41', '\xf7'};
+ dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
+ QString text = "This can be a copyright, song name, instrument,
lyric...";
+ TextEvent te(text, 3);
+--
+cgit v0.12
+
diff --git a/video/dvgrab/BUILD b/video/dvgrab/BUILD
new file mode 100755
index 0000000..c0318d0
--- /dev/null
+++ b/video/dvgrab/BUILD
@@ -0,0 +1,2 @@
+CXXFLAGS+=" -Wno-narrowing" &&
+default_build
diff --git a/video/dvgrab/HISTORY b/video/dvgrab/HISTORY
index eb70106..daef5fc 100644
--- a/video/dvgrab/HISTORY
+++ b/video/dvgrab/HISTORY
@@ -1,3 +1,6 @@
+2016-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: added, fix for gcc-6
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (35e9cfe919f7a41d556626f5a6b721a243232a6f), Treeve Jelbert, 05/23/2016