svn commit: r335777 - in head/multimedia/lives: . files
Pawel Pekala
pawel at FreeBSD.org
Fri Dec 6 17:01:24 UTC 2013
Author: pawel
Date: Fri Dec 6 17:01:22 2013
New Revision: 335777
URL: http://svnweb.freebsd.org/changeset/ports/335777
Log:
Update to version 2.2.0
Deleted:
head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__flv_decoder.c
head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__mkv_decoder.c
head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__mkv_decoder.h
Modified:
head/multimedia/lives/Makefile
head/multimedia/lives/distinfo
head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__asf_decoder.c
head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__mpegts_decoder.c
head/multimedia/lives/files/patch-lives-plugins__plugins__playback__video__lives2lives_stream.c
head/multimedia/lives/files/patch-src__htmsocket.c
head/multimedia/lives/files/patch-src__main.h
head/multimedia/lives/files/patch-src__plugins.h
head/multimedia/lives/pkg-plist
Modified: head/multimedia/lives/Makefile
==============================================================================
--- head/multimedia/lives/Makefile Fri Dec 6 16:59:37 2013 (r335776)
+++ head/multimedia/lives/Makefile Fri Dec 6 17:01:22 2013 (r335777)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lives
-PORTVERSION= 2.0.6
-PORTREVISION= 1
+PORTVERSION= 2.2.0
CATEGORIES= multimedia
MASTER_SITES= http://salsaman.home.xs4all.nl/lives/current/
DISTNAME= LiVES-${PORTVERSION}
@@ -105,10 +104,6 @@ post-patch:
${WRKSRC}/lives-plugins/weed-plugins/cairo/Makefile.in \
${WRKSRC}/lives-plugins/weed-plugins/Makefile.in
-pre-install:
- @cd ${WRKSRC}/po; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
- ${MAKEFILE} update-po
-
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
Modified: head/multimedia/lives/distinfo
==============================================================================
--- head/multimedia/lives/distinfo Fri Dec 6 16:59:37 2013 (r335776)
+++ head/multimedia/lives/distinfo Fri Dec 6 17:01:22 2013 (r335777)
@@ -1,2 +1,2 @@
-SHA256 (LiVES-2.0.6.tar.bz2) = a254fe8fd2264acb2495d8ae101f25c788122ed74722d26581d841ec19b9a224
-SIZE (LiVES-2.0.6.tar.bz2) = 3543817
+SHA256 (LiVES-2.2.0.tar.bz2) = 93cf92fbecd80ac45addf0af6f6d70e283ef7855793ba3319282fafa0b1db35d
+SIZE (LiVES-2.2.0.tar.bz2) = 3578476
Modified: head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__asf_decoder.c
==============================================================================
--- head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__asf_decoder.c Fri Dec 6 16:59:37 2013 (r335776)
+++ head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__asf_decoder.c Fri Dec 6 17:01:22 2013 (r335777)
@@ -1,88 +1,11 @@
---- ./lives-plugins/plugins/decoders/asf_decoder.c.orig 2012-09-17 16:20:55.000000000 +0200
-+++ ./lives-plugins/plugins/decoders/asf_decoder.c 2013-10-27 21:18:00.380266194 +0100
-@@ -30,11 +30,7 @@
- #include <fcntl.h>
- #include <unistd.h>
+--- ./lives-plugins/plugins/decoders/asf_decoder.c.orig 2013-12-05 19:16:35.348036750 +0100
++++ ./lives-plugins/plugins/decoders/asf_decoder.c 2013-12-05 19:18:43.232061256 +0100
+@@ -32,7 +32,7 @@
#include <stdlib.h>
--#ifndef IS_MINGW
+ #include <ctype.h>
+ #ifndef IS_MINGW
-#ifndef IS_SOLARIS
--#include <endian.h>
--#endif
--#endif
-+#include <ctype.h>
- #include <sys/stat.h>
-
- const char *plugin_version="LiVES asf/wmv decoder version 1.0";
-@@ -57,11 +53,35 @@
++#ifndef __FreeBSD__
+ #include <endian.h>
+ #endif
#endif
-
- #include <libavformat/avformat.h>
-+#include <libavcodec/version.h>
- #include <libavutil/avstring.h>
-
- #include "decplugin.h"
- #include "asf_decoder.h"
-
-+#if (LIBAVCODEC_VERSION_MAJOR > 54)
-+#define CodecID AVCodecID
-+#define CODEC_ID_NONE AV_CODEC_ID_NONE
-+#define CODEC_ID_WMV1 AV_CODEC_ID_WMV1
-+#define CODEC_ID_WMV2 AV_CODEC_ID_WMV2
-+#define CODEC_ID_WMV3 AV_CODEC_ID_WMV3
-+#define CODEC_ID_DVVIDEO AV_CODEC_ID_DVVIDEO
-+#define CODEC_ID_MPEG4 AV_CODEC_ID_MPEG4
-+#define CODEC_ID_H264 AV_CODEC_ID_H264
-+#define CODEC_ID_MPEG1VIDEO AV_CODEC_ID_MPEG1VIDEO
-+#define CODEC_ID_MPEG2VIDEO AV_CODEC_ID_MPEG2VIDEO
-+#endif
-+
-+#ifndef FF_API_AVCODEC_OPEN
-+#define FF_API_AVCODEC_OPEN (LIBAVCODEC_VERSION_MAJOR < 55)
-+#endif
-+
-+
-+#if FF_API_AVCODEC_OPEN
-+#define avcodec_open2(a, b, c) avcodec_open(a, b)
-+#endif
-+
-+
-
- static enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag)
- {
-@@ -2003,7 +2023,8 @@
- return FALSE;
- }
-
-- if ((retval=avcodec_open(vidst->codec, codec)) < 0) {
-+
-+ if ((retval=avcodec_open2(vidst->codec, codec, NULL)) < 0) {
- fprintf(stderr, "asf_decoder: Could not open avcodec context (%d) %d\n",retval,vidst->codec->frame_number);
- detach_stream(cdata);
- return FALSE;
-@@ -2323,6 +2344,9 @@
- cdata->asigned=TRUE;
- cdata->ainterleaf=TRUE;
-
-+ av_free(priv->picture);
-+ priv->picture=NULL;
-+
- return cdata;
- }
-
-@@ -2470,6 +2494,7 @@
- priv->ctx->skip_frame=AVDISCARD_NONREF;
-
- priv->last_frame=tframe;
-+ if (priv->picture==NULL) priv->picture = avcodec_alloc_frame();
-
-
- // do this until we reach target frame //////////////
-@@ -2520,7 +2545,7 @@
-
- }
-
-- if (pixel_data==NULL) return TRUE;
-+ if (priv->picture==NULL||pixel_data==NULL) return TRUE;
-
- if (priv->black_fill) btop=cdata->frame_height;
-
Modified: head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__mpegts_decoder.c
==============================================================================
--- head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__mpegts_decoder.c Fri Dec 6 16:59:37 2013 (r335776)
+++ head/multimedia/lives/files/patch-lives-plugins__plugins__decoders__mpegts_decoder.c Fri Dec 6 17:01:22 2013 (r335777)
@@ -1,127 +1,11 @@
---- ./lives-plugins/plugins/decoders/mpegts_decoder.c.orig 2013-03-13 04:33:33.000000000 +0100
-+++ ./lives-plugins/plugins/decoders/mpegts_decoder.c 2013-10-27 21:18:32.478233114 +0100
-@@ -27,11 +27,9 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <stdlib.h>
-+#include <ctype.h>
+--- ./lives-plugins/plugins/decoders/mpegts_decoder.c.orig 2013-12-05 19:19:20.795023448 +0100
++++ ./lives-plugins/plugins/decoders/mpegts_decoder.c 2013-12-05 19:19:44.882059440 +0100
+@@ -30,7 +30,7 @@
+ #include <ctype.h>
#include <sys/stat.h>
-#ifndef IS_MINGW
--#include <endian.h>
--#endif
-
- const char *plugin_version="LiVES mpegts decoder version 1.0";
-
-@@ -55,27 +53,69 @@
-
- #include "decplugin.h"
-
-+
- #include <libavformat/avformat.h>
- #include <libavutil/opt.h>
- #include <libavutil/crc.h>
- #include <libavutil/avstring.h>
- #include <libavutil/mem.h>
- #include <libavcodec/avcodec.h>
-+#include <libavcodec/version.h>
-
- #include "mpegts_decoder.h"
-
-+#ifndef FF_API_OLD_AVOPTIONS
-+#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 53)
-+#endif
-+
-+#if FF_API_OLD_AVOPTIONS
-+#define AV_OPT_TYPE_INT FF_OPT_TYPE_INT
-+#endif
-
- #ifndef offsetof
--# define offsetof(T, F) ((unsigned int)((char *)&((T *)0)->F))
-+#define offsetof(T, F) ((unsigned int)((char *)&((T *)0)->F))
- #endif
-
--#ifndef AV_OPT_TYPE_INT
--#define AV_OPT_TYPE_INT FF_OPT_TYPE_INT
-+
-+#if (LIBAVCODEC_VERSION_MAJOR > 54)
-+#define CodecID AVCodecID
-+#define CODEC_ID_NONE AV_CODEC_ID_NONE
-+#define CODEC_ID_MPEG1VIDEO AV_CODEC_ID_MPEG1VIDEO
-+#define CODEC_ID_MPEG2VIDEO AV_CODEC_ID_MPEG2VIDEO
-+#define CODEC_ID_MPEG4 AV_CODEC_ID_MPEG4
-+#define CODEC_ID_H264 AV_CODEC_ID_H264
-+#define CODEC_ID_DIRAC AV_CODEC_ID_DIRAC
-+#define CODEC_ID_MP3 AV_CODEC_ID_MP3
-+#define CODEC_ID_AAC AV_CODEC_ID_AAC
-+#define CODEC_ID_VC1 AV_CODEC_ID_VC1
-+#define CODEC_ID_PCM_BLURAY AV_CODEC_ID_PCM_BLURAY
-+#define CODEC_ID_AC3 AV_CODEC_ID_AC3
-+#define CODEC_ID_EAC3 AV_CODEC_ID_EAC3
-+#define CODEC_ID_DTS AV_CODEC_ID_DTS
-+#define CODEC_ID_TRUEHD AV_CODEC_ID_TRUEHD
-+#define CODEC_ID_S302M AV_CODEC_ID_S302M
-+#define CODEC_ID_DVB_TELETEXT AV_CODEC_ID_DVB_TELETEXT
-+#define CODEC_ID_DVB_SUBTITLE AV_CODEC_ID_DVB_SUBTITLE
-+#endif
-+
-+#ifndef FF_API_AVCODEC_OPEN
-+#define FF_API_AVCODEC_OPEN (LIBAVCODEC_VERSION_MAJOR < 55)
- #endif
-
-
-+#if FF_API_AVCODEC_OPEN
-+#define avcodec_open2(a, b, c) avcodec_open(a, b)
-+#endif
-
-
-+#ifndef FF_API_ALLOC_CONTEXT
-+#define FF_API_ALLOC_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 55)
-+#endif
-+
-+
-+#if FF_API_ALLOC_CONTEXT
-+#define avcodec_alloc_context3(a) avcodec_alloc_context()
-+#endif
-
- /**
- * Read 1-25 bits.
-@@ -3064,9 +3104,9 @@
- return FALSE;
- }
-
-- priv->ctx = ctx = avcodec_alloc_context();
-+ priv->ctx = ctx = avcodec_alloc_context3(codec);
-
-- if (avcodec_open(ctx, codec) < 0) {
-+ if (avcodec_open2(ctx, codec, NULL) < 0) {
- fprintf(stderr, "mpegts_decoder: Could not open avcodec context\n");
- detach_stream(cdata);
- return FALSE;
-@@ -3292,6 +3332,9 @@
- fprintf(stderr,"fps is %.4f %ld %ld %ld\n",cdata->fps,cdata->nframes,ldts,priv->start_dts);
++#ifndef __FreeBSD__
+ #include <endian.h>
#endif
-+ av_free(priv->picture);
-+ priv->picture=NULL;
-+
- return TRUE;
- }
-
-@@ -3517,6 +3560,7 @@
- //priv->ctx->skip_frame=AVDISCARD_NONREF;
-
- priv->last_frame=tframe;
-+ if (priv->picture==NULL) priv->picture = avcodec_alloc_frame();
-
- // do this until we reach target frame //////////////
-
-@@ -3554,7 +3598,7 @@
-
- }
-
-- if (pixel_data==NULL) return TRUE;
-+ if (priv->picture==NULL||pixel_data==NULL) return TRUE;
-
- for (p=0;p<nplanes;p++) {
- dst=pixel_data[p];
Modified: head/multimedia/lives/files/patch-lives-plugins__plugins__playback__video__lives2lives_stream.c
==============================================================================
--- head/multimedia/lives/files/patch-lives-plugins__plugins__playback__video__lives2lives_stream.c Fri Dec 6 16:59:37 2013 (r335776)
+++ head/multimedia/lives/files/patch-lives-plugins__plugins__playback__video__lives2lives_stream.c Fri Dec 6 17:01:22 2013 (r335777)
@@ -1,5 +1,5 @@
--- ./lives-plugins/plugins/playback/video/lives2lives_stream.c.orig 2013-03-16 13:14:33.000000000 +0100
-+++ ./lives-plugins/plugins/playback/video/lives2lives_stream.c 2013-10-27 21:11:48.511145328 +0100
++++ ./lives-plugins/plugins/playback/video/lives2lives_stream.c 2013-12-05 19:12:38.654055182 +0100
@@ -8,7 +8,7 @@
#include <inttypes.h>
#include <sys/types.h>
Modified: head/multimedia/lives/files/patch-src__htmsocket.c
==============================================================================
--- head/multimedia/lives/files/patch-src__htmsocket.c Fri Dec 6 16:59:37 2013 (r335776)
+++ head/multimedia/lives/files/patch-src__htmsocket.c Fri Dec 6 17:01:22 2013 (r335777)
@@ -1,5 +1,5 @@
---- ./src/htmsocket.c.orig 2013-07-03 02:29:02.000000000 +0200
-+++ ./src/htmsocket.c 2013-10-27 21:11:48.514119239 +0100
+--- ./src/htmsocket.c.orig 2013-11-12 03:18:17.000000000 +0100
++++ ./src/htmsocket.c 2013-12-05 19:12:38.657055983 +0100
@@ -8,7 +8,7 @@
#include <stdio.h>
#include <unistd.h>
Modified: head/multimedia/lives/files/patch-src__main.h
==============================================================================
--- head/multimedia/lives/files/patch-src__main.h Fri Dec 6 16:59:37 2013 (r335776)
+++ head/multimedia/lives/files/patch-src__main.h Fri Dec 6 17:01:22 2013 (r335777)
@@ -1,5 +1,5 @@
---- ./src/main.h.orig 2013-07-12 05:54:50.000000000 +0200
-+++ ./src/main.h 2013-10-27 21:11:48.518161862 +0100
+--- ./src/main.h.orig 2013-11-22 14:59:46.000000000 +0100
++++ ./src/main.h 2013-12-05 19:12:38.661054117 +0100
@@ -144,6 +144,7 @@
Modified: head/multimedia/lives/files/patch-src__plugins.h
==============================================================================
--- head/multimedia/lives/files/patch-src__plugins.h Fri Dec 6 16:59:37 2013 (r335776)
+++ head/multimedia/lives/files/patch-src__plugins.h Fri Dec 6 17:01:22 2013 (r335777)
@@ -1,5 +1,5 @@
---- ./src/plugins.h.orig 2013-07-24 18:43:57.000000000 +0200
-+++ ./src/plugins.h 2013-10-27 21:11:48.521162174 +0100
+--- ./src/plugins.h.orig 2013-11-21 14:23:34.000000000 +0100
++++ ./src/plugins.h 2013-12-05 19:12:38.664047584 +0100
@@ -12,7 +12,7 @@
#include <string.h>
#include <fcntl.h>
Modified: head/multimedia/lives/pkg-plist
==============================================================================
--- head/multimedia/lives/pkg-plist Fri Dec 6 16:59:37 2013 (r335776)
+++ head/multimedia/lives/pkg-plist Fri Dec 6 17:01:22 2013 (r335777)
@@ -52,6 +52,8 @@ lib/lives/plugins/decoders/mpegts_decode
lib/lives/plugins/decoders/mpegts_decoder.so
lib/lives/plugins/decoders/ogg_decoder.la
lib/lives/plugins/decoders/ogg_decoder.so
+lib/lives/plugins/decoders/zzavformat_decoder.la
+lib/lives/plugins/decoders/zzavformat_decoder.so
lib/lives/plugins/effects/realtime/weed/RGBdelay.la
lib/lives/plugins/effects/realtime/weed/RGBdelay.so
lib/lives/plugins/effects/realtime/weed/alien_overlay.la
@@ -147,6 +149,8 @@ lib/lives/plugins/effects/realtime/weed/
lib/lives/plugins/effects/realtime/weed/posterise.so
lib/lives/plugins/effects/realtime/weed/puretext.la
lib/lives/plugins/effects/realtime/weed/puretext.so
+lib/lives/plugins/effects/realtime/weed/randomiser.la
+lib/lives/plugins/effects/realtime/weed/randomiser.so
lib/lives/plugins/effects/realtime/weed/revTV.la
lib/lives/plugins/effects/realtime/weed/revTV.so
lib/lives/plugins/effects/realtime/weed/rippleTV.la
@@ -399,6 +403,7 @@ share/applications/LiVES.desktop
%%NLS%%share/locale/nl_NL/LC_MESSAGES/lives.mo
%%NLS%%share/locale/oc/LC_MESSAGES/lives.mo
%%NLS%%share/locale/pl/LC_MESSAGES/lives.mo
+%%NLS%%share/locale/pms/LC_MESSAGES/lives.mo
%%NLS%%share/locale/pt/LC_MESSAGES/lives.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/lives.mo
%%NLS%%share/locale/ro/LC_MESSAGES/lives.mo
@@ -415,6 +420,8 @@ share/pixmaps/lives.xpm
%%NLS%%@dirrmtry share/locale/ug
%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/te
+%%NLS%%@dirrmtry share/locale/pms/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pms
%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/oc
%%NLS%%@dirrmtry share/locale/nl_NL/LC_MESSAGES
More information about the svn-ports-head
mailing list