Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (777f3989364163c87113b40c0ade6820eff13701)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (777f3989364163c87113b40c0ade6820eff13701)
  • Date: Sat, 4 Aug 2012 15:02:10 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

video/miro/DETAILS | 4 +--
video/miro/HISTORY | 4 +++
video/miro/PRE_BUILD | 4 +++
video/miro/ffmpeg.patch | 63
++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 73 insertions(+), 2 deletions(-)

New commits:
commit 777f3989364163c87113b40c0ade6820eff13701
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

miro 5.0.2

diff --git a/video/miro/DETAILS b/video/miro/DETAILS
index a98dc86..e2bf905 100755
--- a/video/miro/DETAILS
+++ b/video/miro/DETAILS
@@ -1,9 +1,9 @@
SPELL=miro
- VERSION=5.0.1
+ VERSION=5.0.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.osuosl.org/pub/pculture.org/miro/src/$SOURCE
-
SOURCE_HASH=sha512:fbfa5588470cddd3caaa8553ec1fbf5f09d063ed2d16ec40a183a822c34aa680a79879d7b9c252a0d5663b78ad0d74d851b71381985f42cb0359938c7d6a6902
+
SOURCE_HASH=sha512:0f0f1ba8be4ba5131ec63db50e540d7570840a25570588f01ab5c2176d7df46769d5b985f8a719abd680ac7b50d4bd6020da2416c186884fd825c53dd6ddb9fb
WEB_SITE=http://www.getmiro.com/
ENTERED=20090804
LICENSE[0]=GPL
diff --git a/video/miro/HISTORY b/video/miro/HISTORY
index 613c489..53e8262 100644
--- a/video/miro/HISTORY
+++ b/video/miro/HISTORY
@@ -1,3 +1,7 @@
+2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.0.2
+ * PRE_BUILD, ffmpeg.patch: patch from Arch added
+
2012-06-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.0.1, SOURCE_DIRECTORY updated

diff --git a/video/miro/PRE_BUILD b/video/miro/PRE_BUILD
new file mode 100755
index 0000000..1d3cb75
--- /dev/null
+++ b/video/miro/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/ffmpeg.patch"
diff --git a/video/miro/ffmpeg.patch b/video/miro/ffmpeg.patch
new file mode 100644
index 0000000..8362308
--- /dev/null
+++ b/video/miro/ffmpeg.patch
@@ -0,0 +1,63 @@
+--- miro-5.0.1/linux/miro-segmenter.c~ 2012-07-06 14:33:24.618082171 +0000
++++ miro-5.0.1/linux/miro-segmenter.c 2012-07-06 15:10:19.564146117 +0000
+@@ -156,7 +156,7 @@
+ exit(1);
+ }
+
+- ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
++ ret = avformat_open_input(&ic, input, ifmt, 0);
+ if (ret != 0) {
+ fprintf(stderr, "Could not open input file, make sure it is an
mpegts file: %d\n", ret);
+ exit(1);
+@@ -215,12 +215,7 @@
+ }
+ }
+
+- if (av_set_parameters(oc, NULL) < 0) {
+- fprintf(stderr, "Invalid output format parameters\n");
+- exit(1);
+- }
+-
+- dump_format(oc, 0, input, 1);
++ av_dump_format(oc, 0, input, 1);
+
+ if (video_st) {
+ codec = avcodec_find_decoder(video_st->codec->codec_id);
+@@ -233,12 +228,12 @@
+ }
+ }
+
+- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
+ fprintf(stderr, "Could not open '%s'\n", output_filename);
+ exit(1);
+ }
+
+- if (av_write_header(oc)) {
++ if (avformat_write_header(oc, NULL)) {
+ fprintf(stderr, "Could not write mpegts header to first output
file\n");
+
+ exit(1);
+@@ -274,10 +269,10 @@
+ }
+
+ if (segment_time - prev_segment_time >= segment_duration) {
+- put_flush_packet(oc->pb);
+- url_fclose(oc->pb);
++ avio_flush(oc->pb);
++ avio_close(oc->pb);
+
+- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
+ fprintf(stderr, "Could not open '%s'\n", output_filename);
+ break;
+ }
+@@ -307,7 +302,7 @@
+ av_freep(&oc->streams[i]);
+ }
+
+- url_fclose(oc->pb);
++ avio_close(oc->pb);
+ av_free(oc);
+
+ /* End-of-transcode marker. */



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (777f3989364163c87113b40c0ade6820eff13701), Ladislav Hagara, 08/04/2012

Archive powered by MHonArc 2.6.24.

Top of Page