From daffe00d4a57c0ef6a21947a8121b8d233d8d3a5 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Fri, 12 Jul 2013 15:01:45 +0000 Subject: - Trim Makefile headers - Drop ABI versions from LIB_DEPENDS - OptionsNG - Pet portlint - Switch to dynamic plist where useful - Canonicalize patch names - Fix DOS line endings in patch files --- graphics/osg-devel/Makefile | 26 +++---- .../patch-src-osgPlugins-xine-video__out__rgb.c | 84 ++++++++++++++++++++++ .../patch-src-osgPlugins-xine-video_out_rgb.c | 84 ---------------------- 3 files changed, 97 insertions(+), 97 deletions(-) create mode 100644 graphics/osg-devel/files/patch-src-osgPlugins-xine-video__out__rgb.c delete mode 100644 graphics/osg-devel/files/patch-src-osgPlugins-xine-video_out_rgb.c (limited to 'graphics/osg-devel') diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index e3442d0f6c24..d5754d2abe09 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -13,9 +13,9 @@ DISTNAME= OpenSceneGraph-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff + tiff:${PORTSDIR}/graphics/tiff CONFLICTS= osg-[0-9]* @@ -65,7 +65,7 @@ PLIST_SUB+= CURL="@comment " .if ${PORT_OPTIONS:MFREETYPE} FORCE_REQUIRE+= FreeType -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 PLIST_SUB+= FREETYPE="" .else FORCE_IGNORE+= FreeType @@ -74,7 +74,7 @@ PLIST_SUB+= FREETYPE="@comment " .if ${PORT_OPTIONS:MGDAL} FORCE_REQUIRE+= GDAL -LIB_DEPENDS+= gdal.17:${PORTSDIR}/graphics/gdal +LIB_DEPENDS+= gdal:${PORTSDIR}/graphics/gdal PLIST_SUB+= GDAL="" .else FORCE_IGNORE+= GDAL @@ -83,7 +83,7 @@ PLIST_SUB+= GDAL="@comment " .if ${PORT_OPTIONS:MGIF} FORCE_REQUIRE+= GIFLIB -LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib +LIB_DEPENDS+= gif:${PORTSDIR}/graphics/giflib PLIST_SUB+= GIF="" .else FORCE_IGNORE+= GIFLIB @@ -102,7 +102,7 @@ PLIST_SUB+= INVENTOR="@comment " .if ${PORT_OPTIONS:MJASPER} FORCE_REQUIRE+= Jasper -LIB_DEPENDS+= jasper.4:${PORTSDIR}/graphics/jasper +LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper PLIST_SUB+= JASPER="" .else FORCE_IGNORE+= Jasper @@ -111,7 +111,7 @@ PLIST_SUB+= JASPER="@comment " #.if ${PORT_OPTIONS:MOPENVRML} #FORCE_REQUIRE+= OpenVRML -#LIB_DEPENDS+= openvrml.8:${PORTSDIR}/www/openvrml +#LIB_DEPENDS+= openvrml:${PORTSDIR}/www/openvrml #PLIST_SUB+= OPENVRML="" #.else FORCE_IGNORE+= OpenVRML @@ -120,7 +120,7 @@ PLIST_SUB+= OPENVRML="@comment " .if ${PORT_OPTIONS:MXINE} FORCE_REQUIRE+= Xine -LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine:${PORTSDIR}/multimedia/libxine PLIST_SUB+= XINE="" .else FORCE_IGNORE+= Xine @@ -140,7 +140,7 @@ PLIST_SUB+= ITK="@comment " .if ${PORT_OPTIONS:MVNC} FORCE_REQUIRE+= LibVNCServer -LIB_DEPENDS+= vncserver.0:${PORTSDIR}/net/libvncserver +LIB_DEPENDS+= vncserver:${PORTSDIR}/net/libvncserver PLIST_SUB+= VNC="" .else FORCE_IGNORE+= LibVNCServer @@ -149,7 +149,7 @@ PLIST_SUB+= VNC="@comment " .if ${PORT_OPTIONS:MOPENEXR} FORCE_REQUIRE+= OpenEXR -LIB_DEPENDS+= IlmImf.6:${PORTSDIR}/graphics/OpenEXR +LIB_DEPENDS+= IlmImf:${PORTSDIR}/graphics/OpenEXR PLIST_SUB+= OPENEXR="" .else FORCE_IGNORE+= OpenEXR @@ -158,7 +158,7 @@ PLIST_SUB+= OPENEXR="@comment " .if ${PORT_OPTIONS:MFFMPEG} FORCE_REQUIRE+= FFmpeg -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg PLIST_SUB+= FFMPEG="" .else FORCE_IGNORE+= FFmpeg @@ -184,7 +184,7 @@ PLIST_SUB+= SVG="@comment " .if ${PORT_OPTIONS:MPDF} FORCE_REQUIRE+= Poppler-glib -LIB_DEPENDS+= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib +LIB_DEPENDS+= poppler-glib:${PORTSDIR}/graphics/poppler-glib PLIST_SUB+= PDF="" .else FORCE_IGNORE+= Poppler-glib @@ -192,7 +192,7 @@ PLIST_SUB+= PDF="@comment " .endif .if ${PORT_OPTIONS:MSVG} || ${PORT_OPTIONS:MPDF} -LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo +LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo .endif # other options diff --git a/graphics/osg-devel/files/patch-src-osgPlugins-xine-video__out__rgb.c b/graphics/osg-devel/files/patch-src-osgPlugins-xine-video__out__rgb.c new file mode 100644 index 000000000000..40ef08509ccc --- /dev/null +++ b/graphics/osg-devel/files/patch-src-osgPlugins-xine-video__out__rgb.c @@ -0,0 +1,84 @@ +--- src/osgPlugins/xine/video_out_rgb.c.orig 2012-02-09 20:42:47.000000000 +0400 ++++ src/osgPlugins/xine/video_out_rgb.c 2012-03-06 23:06:37.317706687 +0400 +@@ -51,6 +51,11 @@ + #include "xine/video_out.h" + #include "video_out_rgb.h" + ++#if !(XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)) ++#define round round_not ++#include ++#undef round ++#endif + + #define THIS "video_out_rgb" + +@@ -2237,9 +2242,15 @@ + + EVAL(vo_frame != NULL) + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + release(frame->chunk[0]); + release(frame->chunk[1]); + release(frame->chunk[2]); ++#else ++ av_freep(frame->chunk[0]); ++ av_freep(frame->chunk[1]); ++ av_freep(frame->chunk[2]); ++#endif + free(frame); + + FAILURE: +@@ -2303,9 +2314,15 @@ + this->frame_width = frame->width; + this->frame_height = frame->height; + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + release(frame->chunk[0]); + release(frame->chunk[1]); + release(frame->chunk[2]); ++#else ++ av_freep(frame->chunk[0]); ++ av_freep(frame->chunk[1]); ++ av_freep(frame->chunk[2]); ++#endif + + CHECK_FRAME: + switch(frame->format) +@@ -2322,6 +2339,7 @@ + frame->vo_frame.pitches[0] = (frame->width > 7) ? frame->width : 8; + frame->vo_frame.pitches[1] = (frame->width > 15) ? (frame->width >> 1) : 8; + frame->vo_frame.pitches[2] = frame->vo_frame.pitches[1]; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + frame->vo_frame.base[0] = (uint8_t*) xine_xmalloc_aligned(16, + frame->vo_frame.pitches[0] * frame->height, + &(frame->chunk[0])); +@@ -2331,6 +2349,14 @@ + frame->vo_frame.base[2] = (uint8_t*) xine_xmalloc_aligned(16, + frame->vo_frame.pitches[2] * (frame->height >> 1), + &(frame->chunk[2])); ++#else ++ frame->vo_frame.base[0] = (uint8_t*)(frame->chunk[0] = ++ av_mallocz(frame->vo_frame.pitches[0] * frame->height)); ++ frame->vo_frame.base[1] = (uint8_t*)(frame->chunk[1] = ++ av_mallocz(frame->vo_frame.pitches[1] * (frame->height >> 1))); ++ frame->vo_frame.base[2] = (uint8_t*)(frame->chunk[2] = ++ av_mallocz(frame->vo_frame.pitches[2] * (frame->height >> 1))); ++#endif + } + break; + +@@ -2346,9 +2372,14 @@ + frame->vo_frame.pitches[0] = (frame->width > 3) ? (frame->width << 1) : 8; + frame->vo_frame.pitches[1] = 0; + frame->vo_frame.pitches[2] = 0; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + frame->vo_frame.base[0] = (uint8_t*) xine_xmalloc_aligned(16, + frame->vo_frame.pitches[0] * frame->height, + &(frame->chunk[0])); ++#else ++ frame->vo_frame.base[0] = (uint8_t*)(frame->chunk[0] = ++ av_mallocz(frame->vo_frame.pitches[0] * frame->height)); ++#endif + frame->vo_frame.base[1] = NULL; + frame->vo_frame.base[2] = NULL; + } diff --git a/graphics/osg-devel/files/patch-src-osgPlugins-xine-video_out_rgb.c b/graphics/osg-devel/files/patch-src-osgPlugins-xine-video_out_rgb.c deleted file mode 100644 index 40ef08509ccc..000000000000 --- a/graphics/osg-devel/files/patch-src-osgPlugins-xine-video_out_rgb.c +++ /dev/null @@ -1,84 +0,0 @@ ---- src/osgPlugins/xine/video_out_rgb.c.orig 2012-02-09 20:42:47.000000000 +0400 -+++ src/osgPlugins/xine/video_out_rgb.c 2012-03-06 23:06:37.317706687 +0400 -@@ -51,6 +51,11 @@ - #include "xine/video_out.h" - #include "video_out_rgb.h" - -+#if !(XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)) -+#define round round_not -+#include -+#undef round -+#endif - - #define THIS "video_out_rgb" - -@@ -2237,9 +2242,15 @@ - - EVAL(vo_frame != NULL) - -+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) - release(frame->chunk[0]); - release(frame->chunk[1]); - release(frame->chunk[2]); -+#else -+ av_freep(frame->chunk[0]); -+ av_freep(frame->chunk[1]); -+ av_freep(frame->chunk[2]); -+#endif - free(frame); - - FAILURE: -@@ -2303,9 +2314,15 @@ - this->frame_width = frame->width; - this->frame_height = frame->height; - -+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) - release(frame->chunk[0]); - release(frame->chunk[1]); - release(frame->chunk[2]); -+#else -+ av_freep(frame->chunk[0]); -+ av_freep(frame->chunk[1]); -+ av_freep(frame->chunk[2]); -+#endif - - CHECK_FRAME: - switch(frame->format) -@@ -2322,6 +2339,7 @@ - frame->vo_frame.pitches[0] = (frame->width > 7) ? frame->width : 8; - frame->vo_frame.pitches[1] = (frame->width > 15) ? (frame->width >> 1) : 8; - frame->vo_frame.pitches[2] = frame->vo_frame.pitches[1]; -+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) - frame->vo_frame.base[0] = (uint8_t*) xine_xmalloc_aligned(16, - frame->vo_frame.pitches[0] * frame->height, - &(frame->chunk[0])); -@@ -2331,6 +2349,14 @@ - frame->vo_frame.base[2] = (uint8_t*) xine_xmalloc_aligned(16, - frame->vo_frame.pitches[2] * (frame->height >> 1), - &(frame->chunk[2])); -+#else -+ frame->vo_frame.base[0] = (uint8_t*)(frame->chunk[0] = -+ av_mallocz(frame->vo_frame.pitches[0] * frame->height)); -+ frame->vo_frame.base[1] = (uint8_t*)(frame->chunk[1] = -+ av_mallocz(frame->vo_frame.pitches[1] * (frame->height >> 1))); -+ frame->vo_frame.base[2] = (uint8_t*)(frame->chunk[2] = -+ av_mallocz(frame->vo_frame.pitches[2] * (frame->height >> 1))); -+#endif - } - break; - -@@ -2346,9 +2372,14 @@ - frame->vo_frame.pitches[0] = (frame->width > 3) ? (frame->width << 1) : 8; - frame->vo_frame.pitches[1] = 0; - frame->vo_frame.pitches[2] = 0; -+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) - frame->vo_frame.base[0] = (uint8_t*) xine_xmalloc_aligned(16, - frame->vo_frame.pitches[0] * frame->height, - &(frame->chunk[0])); -+#else -+ frame->vo_frame.base[0] = (uint8_t*)(frame->chunk[0] = -+ av_mallocz(frame->vo_frame.pitches[0] * frame->height)); -+#endif - frame->vo_frame.base[1] = NULL; - frame->vo_frame.base[2] = NULL; - } -- cgit v1.2.3