Mercurial > mxe-octave

changeset 4083:ab391f476b81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-video: update to 1.2.2 * src/of-video.mk: update version, checksum * src/of-video-1-fixes.patch: removed file * build_packages.m: update video version * dist-files.mk: add of-video.mk
author John Donoghue
date Fri, 29 Jan 2016 13:12:18 -0500
parents dc8afa58289f
children fc806c8583a9
files build_packages.m dist-files.mk src/of-video-1-fixes.patch src/of-video.mk
diffstat 4 files changed, 4 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/build_packages.m	Wed Jan 20 12:15:48 2016 -0500
+++ b/build_packages.m	Fri Jan 29 13:12:18 2016 -0500
@@ -65,4 +65,5 @@
 try_install mapping-1.2.0.tar.gz
 try_install tisean-0.2.3.tar.gz
 try_install sparsersb-1.0.0.tar.gz
+try_install video-1.2.2.tar.gz
 
--- a/dist-files.mk	Wed Jan 20 12:15:48 2016 -0500
+++ b/dist-files.mk	Fri Jan 29 13:12:18 2016 -0500
@@ -510,6 +510,7 @@
   of-tisean.mk \
   of-tsa-1-cross-fixes.patch \
   of-tsa.mk \
+  of-video.mk \
   of-windows-1-fixes.patch \
   of-windows.mk \
   of-zenity.mk \
--- a/src/of-video-1-fixes.patch	Wed Jan 20 12:15:48 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-diff -ur video-1.2.1.orig/src/AVHandler.cc video-1.2.1/src/AVHandler.cc
---- video-1.2.1.orig/src/AVHandler.cc	2016-01-06 12:44:20.588188244 -0500
-+++ video-1.2.1/src/AVHandler.cc	2016-01-08 08:40:05.511829573 -0500
-@@ -560,7 +560,7 @@
-     }
- 
-   // XXX FIXME XXX What is the best size for video_outbuf?
--  video_outbuf = (uint8_t *)malloc(VIDEO_OUTBUF_SIZE);
-+  video_outbuf = (uint8_t *)av_malloc(VIDEO_OUTBUF_SIZE);
- 
-   return 0;
- }
-diff -ur video-1.2.1.orig/src/oct-avifile.cc video-1.2.1/src/oct-avifile.cc
---- video-1.2.1.orig/src/oct-avifile.cc	2016-01-06 12:44:20.588188244 -0500
-+++ video-1.2.1/src/oct-avifile.cc	2016-01-08 08:38:22.357487990 -0500
-@@ -57,6 +57,14 @@
- }
- 
- void
-+Avifile::print(std::ostream& os, bool pr_as_read_syntax)
-+{
-+  os << "AVI movie [" << filename << "][" << av->get_codec() << "]: "
-+     << frames << " frame" << (frames != 1 ? "s" : "") << ", "
-+     << frame_rows << "x" << frame_columns << "\n";
-+}
-+
-+void
- Avifile::addframe(const NDArray &f)
- {
-   if (frames == 0)
-diff -ur video-1.2.1.orig/src/oct-avifile.h video-1.2.1/src/oct-avifile.h
---- video-1.2.1.orig/src/oct-avifile.h	2016-01-06 12:44:20.588188244 -0500
-+++ video-1.2.1/src/oct-avifile.h	2016-01-08 08:39:19.029576872 -0500
-@@ -52,6 +52,7 @@
-   ~Avifile(void);
- 
-   void print(std::ostream& os, bool pr_as_read_syntax) const;
-+  void print(std::ostream& os, bool pr_as_read_syntax=false);
- 
-   void addframe(const NDArray &f);
- 
--- a/src/of-video.mk	Wed Jan 20 12:15:48 2016 -0500
+++ b/src/of-video.mk	Fri Jan 29 13:12:18 2016 -0500
@@ -3,8 +3,8 @@
 
 PKG             := of-video
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.1
-$(PKG)_CHECKSUM := dbefd278e272fcd9a79d2edc4b00df37735b103a
+$(PKG)_VERSION  := 1.2.2
+$(PKG)_CHECKSUM := f7fd729ade4dcd8951cc61e9b13b89dbfaf342bd
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := video-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz