summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mjpegtools/Makefile2
-rw-r--r--multimedia/mjpegtools/files/patch-mpeg2enc_encoderparams.hh14
-rw-r--r--multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass1.hh9
-rw-r--r--multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass2.hh9
4 files changed, 33 insertions, 1 deletions
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 38280cdcd7e6..45c8b5f1e310 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mjpegtools
PORTVERSION= 2.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}
diff --git a/multimedia/mjpegtools/files/patch-mpeg2enc_encoderparams.hh b/multimedia/mjpegtools/files/patch-mpeg2enc_encoderparams.hh
new file mode 100644
index 000000000000..87d751233614
--- /dev/null
+++ b/multimedia/mjpegtools/files/patch-mpeg2enc_encoderparams.hh
@@ -0,0 +1,14 @@
+Use class RateCtl instead of struct.
+Class RateCtl is defined in ratectl.hh and used elsewhere in the code too.
+
+--- ./mpeg2enc/encoderparams.hh.orig 2014-07-21 16:50:46.000000000 +0200
++++ ./mpeg2enc/encoderparams.hh 2014-07-21 16:50:56.000000000 +0200
+@@ -79,7 +79,7 @@
+ };
+
+
+-struct RateCtl;
++class RateCtl;
+ class MPEG2EncOptions;
+
+ class EncoderParams
diff --git a/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass1.hh b/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass1.hh
new file mode 100644
index 000000000000..2ab2038a0a60
--- /dev/null
+++ b/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass1.hh
@@ -0,0 +1,9 @@
+--- mpeg2enc/ontheflyratectlpass1.hh.orig 2014-07-21 16:51:41.000000000 +0200
++++ mpeg2enc/ontheflyratectlpass1.hh 2014-07-21 16:52:29.000000000 +0200
+@@ -1,5 +1,5 @@
+ #ifndef _ONTHEFLYRATECTLPASS1_HH
+-#define _ONTHELFYRATECTLPASS1_HH
++#define _ONTHEFLYRATECTLPASS1_HH
+
+ /* (C) 2003 Andrew Stevens */
+
diff --git a/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass2.hh b/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass2.hh
new file mode 100644
index 000000000000..9353f0068a32
--- /dev/null
+++ b/multimedia/mjpegtools/files/patch-mpeg2enc_ontheflyratectlpass2.hh
@@ -0,0 +1,9 @@
+--- mpeg2enc/ontheflyratectlpass2.hh.orig 2014-07-21 16:51:46.000000000 +0200
++++ mpeg2enc/ontheflyratectlpass2.hh 2014-07-21 16:52:33.000000000 +0200
+@@ -1,5 +1,5 @@
+ #ifndef _ONTHEFLYRATECTLPASS2_HH
+-#define _ONTHELFYRATECTLPASS2_HH
++#define _ONTHEFLYRATECTLPASS2_HH
+
+ /* (C) 2003 Andrew Stevens */
+