diff options
| author | bsiegert <bsiegert> | 2016-05-23 05:04:39 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2016-05-23 05:04:39 +0000 |
| commit | 45779797b3c05a0fde0ffc64ffff5d167fcf2dd1 (patch) | |
| tree | c13c278eb7331ee80d8e9d855404e68ae407a7b0 | |
| parent | ffc110ae9845bdb1f9ab0ee1b36e43e525164d30 (diff) | |
| download | pkgsrc-45779797b3c05a0fde0ffc64ffff5d167fcf2dd1.tar.gz | |
Pullup ticket #4999 - requested by joerg
multimedia/gopchop: build fix
Revisions pulled up:
- multimedia/gopchop/distinfo 1.9
- multimedia/gopchop/patches/patch-src_Main.cpp 1.1
---
Module Name: pkgsrc
Committed By: joerg
Date: Sat May 7 10:07:15 UTC 2016
Modified Files:
pkgsrc/multimedia/gopchop: distinfo
Added Files:
pkgsrc/multimedia/gopchop/patches: patch-src_Main.cpp
Log Message:
Don't use C99 designators in C++.
| -rw-r--r-- | multimedia/gopchop/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/gopchop/patches/patch-src_Main.cpp | 39 |
2 files changed, 41 insertions, 1 deletions
diff --git a/multimedia/gopchop/distinfo b/multimedia/gopchop/distinfo index d873bff165c..2c18f1716cc 100644 --- a/multimedia/gopchop/distinfo +++ b/multimedia/gopchop/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 23:54:25 agc Exp $ +$NetBSD: distinfo,v 1.8.4.1 2016/05/23 05:04:39 bsiegert Exp $ SHA1 (gopchop-1.1.8.tar.gz) = 6e879c6cbf081df8fa44b535c9fd991ae175d5a2 RMD160 (gopchop-1.1.8.tar.gz) = 8e5cffca5ef2cc7c1d055ac0a5a20e75d074c2d1 @@ -6,3 +6,4 @@ SHA512 (gopchop-1.1.8.tar.gz) = 5c2af09415c3bc570fe72423912ce8e604031cf58fd1d3f0 Size (gopchop-1.1.8.tar.gz) = 574559 bytes SHA1 (patch-aa) = 0bb17c6001a06b782cb8aca8a8d82df66cde100d SHA1 (patch-ab) = 24496930dbe8d58aeea87abcbfad1a30397f6f87 +SHA1 (patch-src_Main.cpp) = 623ce3c7581e69fd871199d344228f5fd943d989 diff --git a/multimedia/gopchop/patches/patch-src_Main.cpp b/multimedia/gopchop/patches/patch-src_Main.cpp new file mode 100644 index 00000000000..df9780d827c --- /dev/null +++ b/multimedia/gopchop/patches/patch-src_Main.cpp @@ -0,0 +1,39 @@ +$NetBSD: patch-src_Main.cpp,v 1.1.2.2 2016/05/23 05:04:39 bsiegert Exp $ + +C99 initializers are not valid in C++. + +--- src/Main.cpp.orig 2016-05-06 18:19:50.000000000 +0000 ++++ src/Main.cpp +@@ -124,19 +124,20 @@ int *client_pipe = NULL; + * Update the menu activation handler to auto-save the rc file. + */ + global_options options={ +- run_loop: 0, /* don't wrap arround by default */ +- run_speed: 1, /* one frame at a time by default */ +- default_run_speed: 1, /* one frame at a time by default */ +- auto_refresh: 1, /* show gop position changes by default */ +- ignore_errors: 0, /* don't ignore errors by default */ +- drop_orphaned_frames: 0, /* orphaned frame dropping can be nasty */ +- adjust_timestamps: 1, /* adjust by default */ +- video_driver_ptr: NULL, /* prefered video driver */ +- video_driver: "\0", +- force_system_header: 0, /* force prepended system header pack */ +- drop_trailing_pack_with_system_header: 0, /* drop final pack if it has a system header */ +- ignore_endcode: 0, /* don't stop parsing when an End Code is seen */ ++ /* run_loop: */ 0, /* don't wrap arround by default */ ++ /* run_speed: */ 1, /* one frame at a time by default */ ++ /* default_run_speed: */ 1, /* one frame at a time by default */ ++ /* auto_refresh: */ 1, /* show gop position changes by default */ ++ /* ignore_errors: */ 0, /* don't ignore errors by default */ ++ /* drop_orphaned_frames: */ 0, /* orphaned frame dropping can be nasty */ ++ /* adjust_timestamps: */ 1, /* adjust by default */ ++ /* video_driver_ptr: */ NULL, /* prefered video driver */ ++ /* video_driver: */ "\0", ++ /* force_system_header: */ 0, /* force prepended system header pack */ ++ /* drop_trailing_pack_with_system_header: */ 0, /* drop final pack if it has a system header */ ++ /* ignore_endcode: */ 0, /* don't stop parsing when an End Code is seen */ + }; ++ + rc_parse_item parsable_items[] = { + { "run_loop", &options.run_loop, RC_TYPE_BOOLEAN }, + { "default_run_speed", &options.default_run_speed, RC_TYPE_INTEGER }, |