Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (67cb6fb67fbbd0fccd1548c9b64ab059fd0ccdf0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (67cb6fb67fbbd0fccd1548c9b64ab059fd0ccdf0)
  • Date: Wed, 18 Apr 2012 05:25:08 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

video/vlc/HISTORY | 4 ++++
video/vlc/PRE_BUILD | 4 +++-
video/vlc/glx.patch | 13 +++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit f58e26f4d9d100549690bbc9eb945b0ea115b23e
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

vlc: patch to fix xcb build error (fixes #366)
from
http://git.videolan.org/?p=vlc/vlc-2.0.git;a=commit;h=233f70b51cc63010b19b2a40b9839e8e610612c9
should be fixed in next update

diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 5f3c9b9..0749da8 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,7 @@
+2012-04-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD, glx.patch: added to fix xcb build error, Bug #366
+ from vlc git repo, should be fixed on next update
+
2012-04-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: only depend on libcdio if the optional dependency on
vcdimager-unstable is enabled
diff --git a/video/vlc/PRE_BUILD b/video/vlc/PRE_BUILD
index 02c2ea1..50fd9d3 100755
--- a/video/vlc/PRE_BUILD
+++ b/video/vlc/PRE_BUILD
@@ -8,4 +8,6 @@ elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey;
then
sedit 's:$(libdir)/mozilla:$(libdir)/seamonkey:' $MOZ_MAKEFILE
elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
sedit 's:$(libdir)/mozilla:$(libdir)/xulrunner:' $MOZ_MAKEFILE
-fi
+fi &&
+
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/glx.patch
diff --git a/video/vlc/glx.patch b/video/vlc/glx.patch
new file mode 100644
index 0000000..69b2ca6
--- /dev/null
+++ b/video/vlc/glx.patch
@@ -0,0 +1,13 @@
+--- a/modules/video_output/xcb/glx.c
++++ b/modules/video_output/xcb/glx.c
+@@ -381,7 +381,10 @@ static int Open (vlc_object_t *obj)
+ if (HasExtension (glx_extensions, "GLX_EXT_swap_control")) {
+ PFNGLXSWAPINTERVALEXTPROC SwapIntervalEXT =
(PFNGLXSWAPINTERVALEXTPROC)GetProcAddress (NULL, "glXSwapIntervalEXT");
+ if (!is_swap_interval_set && SwapIntervalEXT)
+- is_swap_interval_set = !SwapIntervalEXT (dpy, sys->glwin, 1);
++ {
++ SwapIntervalEXT (dpy, sys->glwin, 1);
++ is_swap_interval_set = true;
++ }
+ }
+ #endif



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (67cb6fb67fbbd0fccd1548c9b64ab059fd0ccdf0), Sukneet Basuta, 04/18/2012

Archive powered by MHonArc 2.6.24.

Top of Page