Page MenuHomeFreeBSD
Files F162914655

D6806.id17517.diff
No OneTemporary
Actions

D6806.id17517.diff
View Options

Index: head/multimedia/vdr-plugin-osdpip/Makefile
===================================================================
--- head/multimedia/vdr-plugin-osdpip/Makefile
+++ head/multimedia/vdr-plugin-osdpip/Makefile
@@ -2,28 +2,27 @@
# $FreeBSD$
PORTNAME= vdr-plugin-osdpip
-PORTVERSION= 0.1.1
-PORTREVISION= 6
+PORTVERSION= 0.1.2
CATEGORIES= multimedia
-MASTER_SITES= http://projects.vdr-developer.org/attachments/download/880/
+MASTER_SITES= http://projects.vdr-developer.org/attachments/download/961/
DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
-
-PATCH_SITES= http://projects.vdr-developer.org/attachments/download/893/
-PATCHFILES= osdpip-vdr-1.7.26.diff
+DIST_SUBDIR= vdr
MAINTAINER= ports@FreeBSD.org
COMMENT= Video Disk Recorder - picture-in-picture plugin
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg
USES= pkgconfig tar:tgz
-DIST_SUBDIR= vdr
-PATCH_STRIP= -p1
-PATCH_DIST_STRIP= -p1
HAVE_CONFIGURE= yes
PORTDOCS= COPYING README HISTORY
WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION}
+OPTIONS_DEFINE= DOCS
+
.include "${.CURDIR}/../vdr/Makefile.plugins"
post-patch: post-patch-plugin
@@ -32,6 +31,8 @@
${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr
post-install: post-install-pluginlocales
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
Index: head/multimedia/vdr-plugin-osdpip/distinfo
===================================================================
--- head/multimedia/vdr-plugin-osdpip/distinfo
+++ head/multimedia/vdr-plugin-osdpip/distinfo
@@ -1,4 +1,3 @@
-SHA256 (vdr/vdr-osdpip-0.1.1.tgz) = 777f5fd9abbfbf43227c78eb2b363d3bdade2b368425ed78caa836d4c38bfef4
-SIZE (vdr/vdr-osdpip-0.1.1.tgz) = 53272
-SHA256 (vdr/osdpip-vdr-1.7.26.diff) = fa58b9671439b7a5a13d7b3e93b5a7596aecf5169b4400b5bf5a922c90e6132f
-SIZE (vdr/osdpip-vdr-1.7.26.diff) = 1057
+TIMESTAMP = 1465488132
+SHA256 (vdr/vdr-osdpip-0.1.2.tgz) = 08761f6474dd2e5bd4d3dc83b4d2d3b9169a04931cb8aca2e54fdb5ad979a0c6
+SIZE (vdr/vdr-osdpip-0.1.2.tgz) = 50756
Index: head/multimedia/vdr-plugin-osdpip/files/patch-Makefile
===================================================================
--- head/multimedia/vdr-plugin-osdpip/files/patch-Makefile
+++ head/multimedia/vdr-plugin-osdpip/files/patch-Makefile
@@ -1,15 +1,18 @@
---- osdpip-0.1.0/Makefile.orig
-+++ osdpip-0.1.0/Makefile
-@@ -107,7 +107,7 @@ endif
+--- Makefile.orig 2012-05-16 19:06:00 UTC
++++ Makefile
+@@ -156,7 +156,11 @@ i18n: $(I18Nmsgs) $(I18Npot)
- ### The object files (add further files here):
+ libvdr-$(PLUGIN).so: $(OBJS)
+ $(CXX) $(CXXFLAGS) -shared -o $@ $^ $(LIBS)
++ifdef FREEBSD
++ @cp -f $@ $(LIBDIR)/$@.$(APIVERSION)
++else
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
++endif
--OBJS = $(PLUGIN).o osd_info.o remux.o osd.o receiver.o setup.o i18n.o pes.o quantize.o decoder.o
-+OBJS = $(PLUGIN).o osd_info.o remux.o osd.o receiver.o setup.o pes.o quantize.o decoder.o
-
- ### The main target:
-
-@@ -171,3 +173,6 @@ dist: clean
+ dist: clean
+ @-rm -rf $(TMPDIR)/$(ARCHIVE)
+@@ -168,3 +172,6 @@ dist: clean
clean:
@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
Index: head/multimedia/vdr-plugin-osdpip/files/patch-decoder.c
===================================================================
--- head/multimedia/vdr-plugin-osdpip/files/patch-decoder.c
+++ head/multimedia/vdr-plugin-osdpip/files/patch-decoder.c
@@ -1,4 +1,4 @@
---- decoder.c.orig
+--- decoder.c.orig 2012-02-12 12:24:00 UTC
+++ decoder.c
@@ -55,13 +55,13 @@ int cDecoder::Close()
{
Index: head/multimedia/vdr-plugin-osdpip/files/patch-ffmpeg1
===================================================================
--- head/multimedia/vdr-plugin-osdpip/files/patch-ffmpeg1
+++ head/multimedia/vdr-plugin-osdpip/files/patch-ffmpeg1
@@ -1,7 +1,7 @@
-Index: osdpip-0.1.1/decoder.h
+Index: decoder.h
===================================================================
---- osdpip-0.1.1.orig/decoder.h
-+++ osdpip-0.1.1/decoder.h
+--- decoder.h.orig
++++ decoder.h
@@ -34,7 +34,7 @@ extern "C"
#include <libavcodec/avcodec.h>
#ifdef USE_SWSCALE
@@ -11,10 +11,10 @@
#endif
#else
#include <ffmpeg/avcodec.h>
-Index: osdpip-0.1.1/osdpip.c
+Index: osdpip.c
===================================================================
---- osdpip-0.1.1.orig/osdpip.c
-+++ osdpip-0.1.1/osdpip.c
+--- osdpip.c.orig
++++ osdpip.c
@@ -73,8 +73,6 @@ bool cPluginOsdpip::ProcessArgs(int argc
bool cPluginOsdpip::Initialize(void)
Index: head/multimedia/vdr-plugin-osdpip/files/patch-ffmpeg3
===================================================================
--- head/multimedia/vdr-plugin-osdpip/files/patch-ffmpeg3
+++ head/multimedia/vdr-plugin-osdpip/files/patch-ffmpeg3
@@ -0,0 +1,52 @@
+--- decoder.c.orig 2016-06-11 10:45:23.850303000 +0200
++++ decoder.c 2016-06-11 10:50:57.243181000 +0200
+@@ -28,7 +28,7 @@
+
+ int cDecoder::Open()
+ {
+- m_Codec = avcodec_find_decoder(CODEC_ID_MPEG2VIDEO);
++ m_Codec = avcodec_find_decoder(AV_CODEC_ID_MPEG2VIDEO);
+ if (!m_Codec)
+ {
+ printf("codec not found\n");
+@@ -40,8 +40,8 @@
+ printf("could not open codec\n");
+ return -1;
+ }
+- m_PicDecoded = avcodec_alloc_frame();
+- m_PicResample = avcodec_alloc_frame();
++ m_PicDecoded = av_frame_alloc();
++ m_PicResample = av_frame_alloc();
+ m_BufferResample = new unsigned char[400 * 300 * 4]; // size for RGBA32
+ #ifndef USE_SWSCALE
+ m_PicConvert = avcodec_alloc_frame();
+@@ -99,7 +99,7 @@
+ AVPicture pic_crop;
+ struct SwsContext * context;
+
+- av_picture_crop(&pic_crop, (AVPicture *) m_PicDecoded, PIX_FMT_YUV420P, OsdPipSetup.CropTop, OsdPipSetup.CropLeft);
++ av_picture_crop(&pic_crop, (AVPicture *) m_PicDecoded, AV_PIX_FMT_YUV420P, OsdPipSetup.CropTop, OsdPipSetup.CropLeft);
+ #ifdef FF_API_SWS_GETCONTEXT
+ if (!(context = sws_alloc_context())) {
+ printf("Error initializing scale context.\n");
+@@ -126,9 +126,9 @@
+ #else
+ context = sws_getContext(m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight),
+ m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom),
+- PIX_FMT_YUV420P,
++ AV_PIX_FMT_YUV420P,
+ #ifdef USE_NEW_FFMPEG_HEADERS
+- m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P,
++ m_Width, m_Height, ConvertToRGB ? AV_PIX_FMT_RGB32 : AV_PIX_FMT_YUV420P,
+ #else
+ m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P,
+ #endif
+@@ -140,7 +140,7 @@
+ #endif
+ avpicture_fill((AVPicture *) m_PicResample, m_BufferResample,
+ #ifdef USE_NEW_FFMPEG_HEADERS
+- ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P,
++ ConvertToRGB ? AV_PIX_FMT_RGB32 : AV_PIX_FMT_YUV420P,
+ #else
+ ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P,
+ #endif
Index: head/multimedia/vdr-plugin-osdpip/files/patch-i18n.h
===================================================================
--- head/multimedia/vdr-plugin-osdpip/files/patch-i18n.h
+++ head/multimedia/vdr-plugin-osdpip/files/patch-i18n.h
@@ -1,12 +0,0 @@
---- i18n.h.orig
-+++ i18n.h
-@@ -28,8 +28,8 @@
- #if (APIVERSNUM < 10507)
- #define trNOOP(a) a
- #define trVDR tr
--#endif
-
- extern const tI18nPhrase Phrases[];
-+#endif
-
- #endif // VDR_OSDPIP_I18N_H
Index: head/multimedia/vdr-plugin-osdpip/files/patch-libav9
===================================================================
--- head/multimedia/vdr-plugin-osdpip/files/patch-libav9
+++ head/multimedia/vdr-plugin-osdpip/files/patch-libav9
@@ -1,6 +1,6 @@
diff -urN osdpip-0.1.2.old/decoder.c osdpip-0.1.2/decoder.c
---- osdpip-0.1.2.old/decoder.c 2013-06-17 21:01:31.795476861 +0200
-+++ osdpip-0.1.2/decoder.c 2013-06-17 21:01:57.153475959 +0200
+--- decoder.c.orig 2013-06-17 21:01:31.795476861 +0200
++++ decoder.c 2013-06-17 21:01:57.153475959 +0200
@@ -34,8 +34,8 @@
printf("codec not found\n");
return -1;
Index: head/multimedia/vdr-plugin-osdpip/files/patch-osd.c
===================================================================
--- head/multimedia/vdr-plugin-osdpip/files/patch-osd.c
+++ head/multimedia/vdr-plugin-osdpip/files/patch-osd.c
@@ -1,6 +1,6 @@
---- osd.c.orig
+--- osd.c.orig 2012-05-16 20:25:00 UTC
+++ osd.c
-@@ -788,7 +788,7 @@ eOSState cOsdPipObject::ProcessKey(eKeys
+@@ -780,7 +780,7 @@ eOSState cOsdPipObject::ProcessKey(eKeys
if (cControl::Control())
{
cControl::Control()->GetIndex(pos, end);
Index: head/multimedia/vdr-plugin-osdpip/files/patch-receiver.c
===================================================================
--- head/multimedia/vdr-plugin-osdpip/files/patch-receiver.c
+++ head/multimedia/vdr-plugin-osdpip/files/patch-receiver.c
@@ -1,20 +0,0 @@
---- receiver.c.orig
-+++ receiver.c
-@@ -37,11 +37,16 @@ cOsdPipReceiver::cOsdPipReceiver(const c
- cRingBufferFrame *ESBuffer):
- #if (APIVERSNUM < 10500)
- cReceiver(Channel->Ca(), 0, Channel->Vpid()),
--#else
-+#elif (APIVERSNUM < 10725)
- cReceiver(Channel->GetChannelID(), 0, Channel->Vpid()),
-+#else
-+ cReceiver(Channel, 0),
- #endif
- cThread("osdpip_receiver")
- {
-+#if (APIVERSNUM >= 10725)
-+ AddPid(Channel->Vpid());
-+#endif
- m_TSBuffer = new cRingBufferLinear(MEGABYTE(3), TS_SIZE * 2, true);
- m_TSBuffer->SetTimeouts(0, 100);
- m_ESBuffer = ESBuffer;
Index: head/multimedia/vdr-plugin-osdpip/files/patch-vdr-osdpip-0.1.0
===================================================================
--- head/multimedia/vdr-plugin-osdpip/files/patch-vdr-osdpip-0.1.0
+++ head/multimedia/vdr-plugin-osdpip/files/patch-vdr-osdpip-0.1.0
@@ -1,15 +0,0 @@
-diff -ur orig/osdpip-0.1.0/Makefile osdpip-0.1.0/Makefile
---- orig/osdpip-0.1.0/Makefile 2010-03-27 16:38:13.000000000 +0100
-+++ osdpip-0.1.0/Makefile 2010-03-29 09:35:59.000000000 +0200
-@@ -155,7 +155,11 @@
-
- libvdr-$(PLUGIN).so: $(OBJS)
- $(CXX) $(CXXFLAGS) -shared -o $@ $^ $(LIBS)
-+ifdef FREEBSD
-+ @cp -f $@ $(LIBDIR)/$@.$(APIVERSION)
-+else
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-+endif
-
- dist: clean
- @-rm -rf $(TMPDIR)/$(ARCHIVE)
Index: head/multimedia/vdr-plugin-osdpip/pkg-descr
===================================================================
--- head/multimedia/vdr-plugin-osdpip/pkg-descr
+++ head/multimedia/vdr-plugin-osdpip/pkg-descr
@@ -5,4 +5,4 @@
up and down now, watching the progress of the previous channel in the box.
Quality is not too good yet, and only I-Frames are displayed.
-WWW: http://projects.vdr-developer.org/projects/show/plg-osdpip
+WWW: http://projects.vdr-developer.org/projects/plg-osdpip

File Metadata

Mime Type
text/plain
Expires
Sun, Jul 19, 6:35 AM (2 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35224252
Default Alt Text
D6806.id17517.diff (10 KB)

Event Timeline