← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xvidcap/trusty

« back to all changes in this revision

Viewing changes to debian/patches/05_shmchange.diff

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia, Brian Thomason, Alessio Treglia
  • Date: 2010-02-27 11:54:32 UTC
  • Revision ID: james.westby@ubuntu.com-20100227115432-937ezeyo6exkkm38
Tags: 1.1.7-0.2ubuntu8
https://launchpad.net/bugs/528643
[ Brian Thomason ]
* Added patch for header file rename in x11proto-xext-dev (LP: #528643)
  + debian/patches/05_shmchange.diff

[ Alessio Treglia ]
* Bump compat file.
* Update debian/copyright.
* Bump Standards.
* Switch to debian 3.0 (quilt) format, remove debian/README.source

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_shmchange.diff
 
1
Description: shmstr.h was renamed to shmproto in newer x11proto-xext-dev builds
 
2
Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xvidcap/+bug/528643
 
3
--- xvidcap-1.1.7.orig/src/capture.c
 
4
+++ xvidcap-1.1.7/src/capture.c
 
5
@@ -65,7 +65,7 @@
 
6
 #include <sys/ipc.h>
 
7
 #include <sys/shm.h>
 
8
 #include <X11/extensions/XShm.h>
 
9
-#include <X11/extensions/shmstr.h>
 
10
+#include <X11/extensions/shmproto.h>
 
11
 #ifndef SOLARIS
 
12
 #include <X11/extensions/extutil.h>
 
13
 #endif     // SOLARIS