~ubuntu-branches/ubuntu/utopic/libdv/utopic

« back to all changes in this revision

Viewing changes to debian/patches/0004-move_config_h_to_apps.patch

  • Committer: Package Import Robot
  • Author(s): Alessio Treglia
  • Date: 2012-02-09 02:06:17 UTC
  • Revision ID: package-import@ubuntu.com-20120209020617-ef4t0w2zt384ul0i
Tags: 1.0.0-4
* New maintainer. (Closes: #654649), thanks to Daniel Kobras
  for the great work.
* Switch packaging to 3.0 (quilt) format plus DH 7.
* Convert patches to quilt format.
* Build with Multi-Arch support. (Closes: #650994)
* Drop libc6-dev from -DEV's Depends field.
* Get rid of .la files.
* Disable the build of static libraries.
* Remove debian/libdv-bin.links, it doesn't work.
* Remove debian/README.source, it's now unneeded.
* Update debian/copyright as per DEP-5.
* YUV_420_USE_YV12 option affects the wrong encoding (Closes: #466142):
  - The build configuration option --with-pal-yuv=YV12 actually affects
    encoding of "NTSC", inconsistent with decoding. This option is not
    currently used in Debian but could affect those who rebuild it.
    Thanks to Ben Hutchings for report and patch.
* Fix binary-control-field-duplicates-source
* Fix small misspellings.
* Fix hyphen-used-as-minus-sign.
* Run wrap-and-sort -a -s.
* Add watch file.
* Bump Standards.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Author: Daniel Kobras <kobras@debian.org>
 
2
Description: Removing inclusion of config.h from dv_types.h revealed two
 
3
 files that should include it themselves.
 
4
---
 
5
 encodedv/encodedv.c     |    4 ++++
 
6
 encodedv/insert_audio.c |    4 ++++
 
7
 2 files changed, 8 insertions(+)
 
8
 
 
9
--- libdv.orig/encodedv/encodedv.c
 
10
+++ libdv/encodedv/encodedv.c
 
11
@@ -24,6 +24,10 @@
 
12
  *  The libdv homepage is http://libdv.sourceforge.net/.  
 
13
  */
 
14
 
 
15
+#ifdef HAVE_CONFIG_H
 
16
+#include <config.h>
 
17
+#endif
 
18
+
 
19
 #include <string.h>
 
20
 #include "libdv/dv_types.h"
 
21
 #include "libdv/dv.h"
 
22
--- libdv.orig/encodedv/insert_audio.c
 
23
+++ libdv/encodedv/insert_audio.c
 
24
@@ -23,6 +23,10 @@
 
25
  *  The libdv homepage is http://libdv.sourceforge.net/.  
 
26
  */
 
27
 
 
28
+#ifdef HAVE_CONFIG_H
 
29
+#include <config.h>
 
30
+#endif
 
31
+
 
32
 #include "libdv/dv_types.h"
 
33
 
 
34
 #include <stdio.h>