← Back to branch summary

~ubuntu-branches/ubuntu/wily/vdpau-video/wily

« back to all changes in this revision

Viewing changes to debian/patches/GL_VER_1_3.patch

  • Committer: Package Import Robot
  • Author(s): Sebastian Ramacher
  • Date: 2014-05-09 17:17:38 UTC
  • mfrom: (2.2.3 sid)
  • Revision ID: package-import@ubuntu.com-20140509171738-p0zwgb5cyw6c77op
Tags: 0.7.4-1
http://bugs.debian.org/743561
http://bugs.debian.org/713612
* New upstream release.
* debian/control:
  - Add myself to Uploaders.
  - Remove Andres Mejia from Uploaders since he is MIA. Thank you for
    maintaing vdpau-video. (Closes: #743561)
  - Point Homepage to the new home at freedesktop.org.
  - Bump Standards-Version to 3.9.5.
  - Add dh-autoreconf to Build-Depends.
  - Update Vcs-* to use canonical URLs.
* debian/watch: Update watch file to fetch tarball from from the new home at
  freedesktop.org. Thanks to Ross Gammon.
* debian/patches:
  - autoreconf.patch: Removed, no longer needed.
  - cast.patch: Fix build with libvdpau-dev >= 0.7-2. Bump Build-Depends on
    libvdpau-dev accordingly.
  - GL-version-1_3.patch: Apply workaround from Ubuntu to fix build
    failure. (Closes: #713612)
  - libva-constants.patch: Apply patch from upstream to fix build with
    recent libva versions.
* debian/copyright: Convert to Copyright Format 1.0.
* debian/rules:
  - Install upstream changelog.
  - Build with autoreconf.
  - Remove obsolete bits.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/GL_VER_1_3.patch
1
 
Index: vdpau-video-0.7.3/src/utils_glx.h
2
 
===================================================================
3
 
--- vdpau-video-0.7.3.orig/src/utils_glx.h      2011-01-26 05:15:05.000000000 -0500
4
 
+++ vdpau-video-0.7.3/src/utils_glx.h   2013-04-13 09:39:26.122994787 -0400
5
 
@@ -48,6 +48,13 @@
6
 
 typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
7
 
 #endif
8
 
 
9
 
+#if GL_GLEXT_VERSION >= 85
10
 
+/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
11
 
+   block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
12
 
+   Redefine the type here as an interim solution */
13
 
+typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
14
 
+#endif
15
 
+
16
 
 #ifndef GL_FRAMEBUFFER_BINDING
17
 
 #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
18
 
 #endif