Index: Makefile =================================================================== --- Makefile (révision 372384) +++ Makefile (copie de travail) @@ -27,16 +27,16 @@ PORTSCOUT= limitw:1,even -BASE_PORTVERSION= 1.2.4 +BASE_PORTVERSION= 1.4.4 BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION} BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX} -BAD_PORTVERSION= 1.2.4 +BAD_PORTVERSION= 1.4.4 BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION} BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX} -GOOD_PORTVERSION= 1.2.4 +GOOD_PORTVERSION= 1.4.4 GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION} GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX} -UGLY_PORTVERSION= 1.2.4 +UGLY_PORTVERSION= 1.4.4 UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION} UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX} DIST?= base @@ -62,7 +62,7 @@ VERSION= 1.0 PLIST_SUB+= VERSION="${VERSION}" \ - SOVERSION=0.204.0 + SOVERSION=0.404.0 .include @@ -74,7 +74,7 @@ RUN_DEPEDNS+= gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins .endif -.if ${DIST} == base || ${DIST} == ugly +.if ${DIST} == base || ${DIST} == ugly || ${DIST} == bad # --with-default-audiosink specify default audio sink # --with-default-audiosrc specify default audio source # --with-default-videosink specify default video sink @@ -126,12 +126,16 @@ post-patch: .if ${DIST}=="bad" -# custom rule to fix opencv detection in configure - @${REINPLACE_CMD} -e 's|opencv <= 2.4.8|opencv <= 2.4.9|g' \ - ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \ ${WRKSRC}/ext/resindvd/resindvdbin.c \ ${WRKSRC}/ext/resindvd/resindvdsrc.c + + @${FIND} ${WRKSRC}/ext -name 'Makefile.in' | \ + ${XARGS} ${REINPLACE_CMD} -e \ + 's|$$(top_builddir)/gst-libs/gst/base/libgstbadbase|${LOCALBASE}/lib/libgstbadbase|; \ + s|$$(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers|${LOCALBASE}/lib/libgstcodecparsers|; \ + s|$$(top_builddir)/gst-libs/gst/gl/libgstgl|${LOCALBASE}/lib/libgstgl|; \ + s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo|${LOCALBASE}/lib/libgstbadvideo|' .endif .if ${DIST}!="ugly" @${FIND} ${WRKSRC}/ext ${WRKSRC}/sys -name Makefile.in | \ Index: Makefile.common =================================================================== --- Makefile.common (révision 372384) +++ Makefile.common (copie de travail) @@ -20,6 +20,7 @@ faac \ faad \ flite \ + gl \ gme \ gsm \ kate \ @@ -45,11 +46,9 @@ # plugins not yet ported to the 1.0 API, or not portable BAD_GST_ALL_PLUGINS+= \ apexsink \ - cdaudio \ chromaprint \ decklink \ directfb \ - eglgles \ ladspa \ linsys \ lv2 \ @@ -113,7 +112,7 @@ vpx \ wavpack \ x -# xxx pulse \ +# xxx pulse \ GOOD_GST_NON_PLUGINS= \ --disable-dv1394 \ @@ -326,6 +325,12 @@ # openjpeg gst_openjpeg_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 +# OpenGL +#gst_gl_USE_GL= glu +gst_gl_LIB_DEPENDS= libGLU.so:${PORTSDIR}/graphics/libGLU +gst_gl_PLIST_FILES= ${GST_LIB_DIR}/libgstopengl.la \ + ${GST_LIB_DIR}/libgstopengl.so + # opus gst_opus_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus Index: distinfo =================================================================== --- distinfo (révision 372384) +++ distinfo (copie de travail) @@ -1,8 +1,8 @@ -SHA256 (gst-plugins-base-1.2.4.tar.xz) = 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 -SIZE (gst-plugins-base-1.2.4.tar.xz) = 2538012 -SHA256 (gst-plugins-bad-1.2.4.tar.xz) = 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca -SIZE (gst-plugins-bad-1.2.4.tar.xz) = 3272824 -SHA256 (gst-plugins-ugly-1.2.4.tar.xz) = 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 -SIZE (gst-plugins-ugly-1.2.4.tar.xz) = 844968 -SHA256 (gst-plugins-good-1.2.4.tar.xz) = c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 -SIZE (gst-plugins-good-1.2.4.tar.xz) = 2882188 +SHA256 (gst-plugins-base-1.4.4.tar.xz) = 49cd9e8f23c416b1607b43837a09833fa03e0106929d81ead2ddfde6c0ade44b +SIZE (gst-plugins-base-1.4.4.tar.xz) = 2632996 +SHA256 (gst-plugins-bad-1.4.4.tar.xz) = e41b36105c0a13a2cb1ff9f559714e839b82dc3841484cd664790fb7947e55c7 +SIZE (gst-plugins-bad-1.4.4.tar.xz) = 3821332 +SHA256 (gst-plugins-good-1.4.4.tar.xz) = 2df90e99da45211c7b2525ae4ac34830a9e7784bd48c072c406c0cf014bdb277 +SIZE (gst-plugins-good-1.4.4.tar.xz) = 3025496 +SHA256 (gst-plugins-ugly-1.4.4.tar.xz) = afe2300130aaba910b8d5fab8d1fdf8b001ff4893ec1ac57b5d8766836cd81e9 +SIZE (gst-plugins-ugly-1.4.4.tar.xz) = 846420 Index: files/patch-ext_libvisual_visual.c =================================================================== --- files/patch-ext_libvisual_visual.c (révision 372384) +++ files/patch-ext_libvisual_visual.c (copie de travail) @@ -1,13 +0,0 @@ ---- ext/libvisual/visual.c.orig 2013-03-28 03:21:27.000000000 +0000 -+++ ext/libvisual/visual.c 2013-03-28 03:22:29.000000000 +0000 -@@ -300,9 +300,9 @@ - - } - #else -- if (channels == 2) { - guint16 *ldata = visual->audio->plugpcm[0]; - guint16 *rdata = visual->audio->plugpcm[1]; -+ if (channels == 2) { - for (i = 0; i < VISUAL_SAMPLES; i++) { - ldata[i] = *adata++; - rdata[i] = *adata++; Index: pkg-plist =================================================================== --- pkg-plist (révision 372384) +++ pkg-plist (copie de travail) @@ -1,3 +1,4 @@ +bin/gst-device-monitor-%%VERSION%% bin/gst-discoverer-%%VERSION%% bin/gst-play-%%VERSION%% include/gstreamer-%%VERSION%%/gst/allocators/allocators.h @@ -61,6 +62,7 @@ include/gstreamer-%%VERSION%%/gst/rtsp/gstrtsptransport.h include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspurl.h include/gstreamer-%%VERSION%%/gst/rtsp/rtsp.h +include/gstreamer-%%VERSION%%/gst/sdp/gstmikey.h include/gstreamer-%%VERSION%%/gst/sdp/gstsdp.h include/gstreamer-%%VERSION%%/gst/sdp/gstsdpmessage.h include/gstreamer-%%VERSION%%/gst/sdp/sdp.h @@ -87,6 +89,7 @@ include/gstreamer-%%VERSION%%/gst/video/video-frame.h include/gstreamer-%%VERSION%%/gst/video/video-info.h include/gstreamer-%%VERSION%%/gst/video/video-overlay-composition.h +include/gstreamer-%%VERSION%%/gst/video/video-tile.h include/gstreamer-%%VERSION%%/gst/video/video.h include/gstreamer-%%VERSION%%/gst/video/videoorientation.h include/gstreamer-%%VERSION%%/gst/video/videooverlay.h @@ -191,6 +194,7 @@ libdata/pkgconfig/gstreamer-sdp-%%VERSION%%.pc libdata/pkgconfig/gstreamer-tag-%%VERSION%%.pc libdata/pkgconfig/gstreamer-video-%%VERSION%%.pc +man/man1/gst-device-monitor-1.0.1.gz man/man1/gst-discoverer-1.0.1.gz man/man1/gst-play-1.0.1.gz share/gir-1.0/GstAllocators-%%VERSION%%.gir @@ -220,8 +224,8 @@ share/locale/fi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo -share/locale/hr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/id/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo @@ -243,16 +247,3 @@ share/locale/uk/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo -@dirrm share/gst-plugins-base/1.0 -@dirrmtry share/gst-plugins-base -@dirrm include/gstreamer-%%VERSION%%/gst/video -@dirrm include/gstreamer-%%VERSION%%/gst/tag -@dirrm include/gstreamer-%%VERSION%%/gst/sdp -@dirrm include/gstreamer-%%VERSION%%/gst/rtsp -@dirrm include/gstreamer-%%VERSION%%/gst/rtp -@dirrm include/gstreamer-%%VERSION%%/gst/riff -@dirrm include/gstreamer-%%VERSION%%/gst/pbutils -@dirrm include/gstreamer-%%VERSION%%/gst/fft -@dirrm include/gstreamer-%%VERSION%%/gst/audio -@dirrm include/gstreamer-%%VERSION%%/gst/app -@dirrm include/gstreamer-%%VERSION%%/gst/allocators