Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.27 grimoire by Arwed von Merkatz (2609e5dc00b49cb0fbe8bf7bbb4194c3accc3a0a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.27 grimoire by Arwed von Merkatz (2609e5dc00b49cb0fbe8bf7bbb4194c3accc3a0a)
  • Date: Wed, 3 Dec 2008 13:04:30 -0600

GIT changes to stable-0.27 grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

VERSION | 2 +-
dev/null |binary
gnome2-apps/osmo/DETAILS | 2 +-
gnome2-apps/osmo/HISTORY | 3 +++
gnome2-apps/osmo/osmo-0.1.4.tar.gz.sig | 0
gnome2-apps/osmo/osmo-0.2.4.tar.gz.sig |binary
video/vlc/DEPENDS | 2 +-
video/vlc/DETAILS | 6 +++---
video/vlc/HISTORY | 15 +++++++++++++++
video/vlc/PRE_BUILD | 1 +
video/vlc/vlc-separate-window.patch | 11 +++++++++++
11 files changed, 36 insertions(+), 6 deletions(-)

New commits:
commit 2609e5dc00b49cb0fbe8bf7bbb4194c3accc3a0a
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

VERSION: 0.27-3

commit 5de799a1f6529228f2d58ca106cd7b23a81ae81e
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

vlc 0.9.8
(cherry picked from commit 0bf64680f4ae99857b095e9d10003cea16de3d41)

commit 3b865de14227021295911e5f45d74d68cb6ca41b
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

vlc 0.9.7, SECURITY_PATCH=9, SA-0811, CVE-2008-5276
(cherry picked from commit b5eed95013fcd3f44ba437c9d1527b59f178270c)

commit 5dd1986875b8c4d5ef9b7cd5f8f5f6b2ac3341f5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

video/vlc: added the patch missing from
9bd09226a594ee182158295ee90be1822d007738
(cherry picked from commit 01991524c49666ea341d4f8854f5f70934f3a25e)

commit 80a1fb1d73d81ed14dface6f1954791c704c01a1
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

vlc: Requires extra configure options when building without
LIBAVCODEC
(cherry picked from commit 0e5c864ae65b5d8838c74e352d4a7567bc4cfe38)

commit ad0614df8a032af2b18d7876549780efacc5459a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

video/vlc: added a patch to fix integrated video display
(cherry picked from commit 55e926255c22dcbad682f6f3fc33dc3b7d639792)

commit 1343e7f2ca36c2b21c7774012500bb3a3a4bf1fb
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

osmo: Updated to version 0.2.4. Bug #14926
(cherry picked from commit bf031ffe5a6d01ac679901c47d75d4480ec47677)

diff --git a/VERSION b/VERSION
index 8e9b2b4..cf40403 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.27-2
+0.27-3
diff --git a/gnome2-apps/osmo/DETAILS b/gnome2-apps/osmo/DETAILS
index bb4c429..2916f0a 100755
--- a/gnome2-apps/osmo/DETAILS
+++ b/gnome2-apps/osmo/DETAILS
@@ -1,5 +1,5 @@
SPELL=osmo
- VERSION=0.1.4
+ VERSION=0.2.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/osmo/HISTORY b/gnome2-apps/osmo/HISTORY
index 7879679..daf3227 100644
--- a/gnome2-apps/osmo/HISTORY
+++ b/gnome2-apps/osmo/HISTORY
@@ -1,3 +1,6 @@
+2008-12-02 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 0.2.4
+
2007-12-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.1.4

diff --git a/gnome2-apps/osmo/osmo-0.1.4.tar.gz.sig
b/gnome2-apps/osmo/osmo-0.1.4.tar.gz.sig
deleted file mode 100644
index b5b4e8e..0000000
Binary files a/gnome2-apps/osmo/osmo-0.1.4.tar.gz.sig and /dev/null differ
diff --git a/gnome2-apps/osmo/osmo-0.2.4.tar.gz.sig
b/gnome2-apps/osmo/osmo-0.2.4.tar.gz.sig
new file mode 100644
index 0000000..311afdf
Binary files /dev/null and b/gnome2-apps/osmo/osmo-0.2.4.tar.gz.sig differ
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index c50c0f1..cab4196 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -148,7 +148,7 @@ optional_depends libmpeg2 \

optional_depends LIBAVCODEC \
"--enable-avcodec" \
- "--disable-avcodec" \
+ "--disable-avcodec --disable-avformat --disable-postproc"
\
"for lots of video codecs" &&

optional_depends "libmatroska" \
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index f847f11..6e57e92 100755
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,15 +1,15 @@
SPELL=vlc
- VERSION=0.9.6
+ VERSION=0.9.8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.videolan.org/pub/vlc/$VERSION/$SOURCE
WEB_SITE=http://www.videolan.org
-
SOURCE_HASH=sha512:47ed52fd42efc6fbd78bb990df7bc4e56b3500fc4d9b946972a795c4f97fecc380298d7fd1d7af70c3dc4b9fe83cf4e46e8062117242277184742a73324c0b7b
+
SOURCE_HASH=sha512:cca2491d48fc169e1f8727280a5be9cd31cfd23ae2e08c94584a8061e651baab8efd0b09a442d6c9f9b15133b35d22dd8d4744c3a2db25ca5f0a64ad10340fba
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
ENTERED=20011113
KEYWORDS="player video"
- SECURITY_PATCH=8
+ SECURITY_PATCH=10
SHORT="multimedia player"
cat << EOF
VLC (initially VideoLAN Client) is a highly portable multimedia player for
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 505a41b..0bcb29b 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,18 @@
+2008-12-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.8, SECURITY_PATCH=10
+
+2008-12-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.7, SECURITY_PATCH=9, SA-0811, CVE-2008-5276
+ * vlc-separate-window.patch: updated patch
+
+2008-11-26 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: Requires more options to build without LIBAVCODEC
+ --disable-avformat --disable-postproc
+
+2008-11-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, vlc-separate-window.patch: added a patch to repair
+ integrated video display which was broken since 0.9.3
+
2008-11-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.6

diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 02c2ea1..d06301d 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -p0 < ${SCRIPT_DIRECTORY}/vlc-separate-window.patch &&

MOZ_MAKEFILE="projects/mozilla/Makefile.in" &&
if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
diff --git a/video/vlc/vlc-separate-window.patch
b/video/vlc/vlc-separate-window.patch
new file mode 100644
index 0000000..4a67526
--- /dev/null
+++ b/video/vlc/vlc-separate-window.patch
@@ -0,0 +1,11 @@
+--- modules/gui/qt4/qt4.cpp.orig 2008-11-16 20:32:14.606227027 +0100
++++ modules/gui/qt4/qt4.cpp 2008-11-16 20:34:07.252892838 +0100
+@@ -213,7 +213,7 @@
+
+ set_callbacks( OpenDialogs, Close );
+
+-#if 0
++#if !defined (Q_WS_X11) || HAS_QT43
+ add_submodule();
+ set_capability( "vout window", 50 );
+ set_callbacks( WindowOpen, WindowClose );



  • [SM-Commit] GIT changes to stable-0.27 grimoire by Arwed von Merkatz (2609e5dc00b49cb0fbe8bf7bbb4194c3accc3a0a), Arwed von Merkatz, 12/03/2008

Archive powered by MHonArc 2.6.24.

Top of Page