Ticket #37545: gstreamer-1.0.patch
| File gstreamer-1.0.patch, 27.2 KB (added by jeremyhu (Jeremy Huddleston Sequoia), 12 years ago) |
|---|
-
gst-ffmpeg/Portfile
2 2 # $Id$ 3 3 4 4 PortSystem 1.0 5 replaced_by gst-libav 6 PortGroup obsolete 1.0 5 7 6 # https://bugzilla.gnome.org/show_bug.cgi?id=6361347 PortGroup muniversal 1.08 9 8 name gst-ffmpeg 10 version 0.10.13 11 revision 2 12 description This is gst-ffmpeg, a set of plug-ins for GStreamer. 13 long_description ${description} 14 maintainers rmstonecipher openmaintainer 15 categories gnome 16 license GPL-2+ 17 platforms darwin 18 homepage http://www.gnome.org/ 19 master_sites http://gstreamer.freedesktop.org/src/${name}/ 20 21 checksums md5 7f5beacaf1312db2db30a026b36888c4 \ 22 sha1 8de5c848638c16c6c6c14ce3b22eecd61ddeed44 \ 23 rmd160 3e5e3d44302665214cfde8a908b633f8d0f70d31 24 25 patchfiles patch-gst-libs_ext_libav_configure.diff \ 26 patch-configure.ac.diff 27 28 post-patch { 29 reinplace "s|%%CONFIGURE.CC%%|${configure.cc}|g" ${worksrcpath}/gst-libs/ext/libav/configure 30 } 31 32 depends_build port:pkgconfig 33 34 depends_lib port:gst-plugins-base 35 36 use_bzip2 yes 37 38 use_autoreconf yes 39 autoreconf.args -fvi 40 41 # This will cause the installed ffmpeg headers to be used, remove it. 42 configure.cppflags-delete -I${prefix}/include 43 44 if {[variant_isset universal]} { 45 set merger_host(x86_64) x86_64-apple-${os.platform}${os.major} 46 set merger_host(i386) i686-apple-${os.platform}${os.major} 47 set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major} 48 set merger_host(ppc) powerpc-apple-${os.platform}${os.major} 49 set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=x86_64\"" 50 set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=ppc\"" 51 set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=ppc64\"" 52 53 if {[string match "*gcc-4.2" ${configure.compiler}] && [lsearch ${universal_archs} i386] != -1} { 54 if {[vercmp ${xcodeversion} 3.2] >= 0} { 55 set merger_configure_compiler(i386) clang 56 set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=[portconfigure::find_developer_tool clang] --arch=i686\"" 57 } else { 58 # i386 in +universal needs MacPorts base 2.1 on Leopard 59 depends_build port:clang-3.0 60 depends_skip_archcheck-append clang-3.0 61 62 set merger_configure_compiler(i386) macports-clang-3.0 63 64 set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${prefix}/bin/clang-mp-3.0 --arch=i686\"" 65 } 66 } else { 67 set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=i686\"" 68 } 69 } elseif {${build_arch} == "i386"} { 70 if {${configure.compiler} == "gcc-4.2"} { 71 if {[vercmp ${xcodeversion} 3.2] >= 0} { 72 configure.compiler clang 73 } else { 74 depends_build port:clang-3.0 75 depends_skip_archcheck-append clang-3.0 76 77 # FIXME: Use macports-clang-3.0 once 2.1 is out 78 configure.cc ${prefix}/bin/clang-mp-3.0 79 } 80 } 81 configure.args-append \ 82 --host=i686-apple-${os.platform}${os.major} \ 83 --build=i686-apple-${os.platform}${os.major} \ 84 --with-ffmpeg-extra-configure="--cc=${configure.cc} --arch=i686" 85 } else { 86 configure.args-append \ 87 --host=${os.arch}-apple-${os.platform}${os.major} \ 88 --build=${os.arch}-apple-${os.platform}${os.major} \ 89 --with-ffmpeg-extra-configure="--cc=${configure.cc} --arch=${os.arch}" 90 } 91 92 # 93 # embedded ffmpeg code requires gmake 3.81 to build properly 94 # 95 platform darwin 8 { 96 depends_build-append port:gmake 97 depends_skip_archcheck-append gmake 98 99 build.cmd gmake 100 destroot.cmd gmake 101 } 102 103 livecheck.type regex 104 livecheck.url http://gstreamer.freedesktop.org/src/${name}/ 105 livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" 9 version 1.0.4 -
gst-ffmpeg/files/patch-configure.ac.diff
1 --- configure.ac.orig 2013-01-01 19:26:32.000000000 -06002 +++ configure.ac 2013-01-01 19:28:06.000000000 -06003 @@ -22,7 +22,7 @@4 AC_CONFIG_SRCDIR([ext/ffmpeg/gstffmpeg.c])5 6 dnl define the output header for config7 -AM_CONFIG_HEADER([config.h])8 +AC_CONFIG_HEADERS([config.h])9 10 dnl AM_MAINTAINER_MODE only provides the option to configure to enable it11 AM_MAINTAINER_MODE -
gst-ffmpeg/files/patch-gst-libs_ext_libav_configure.diff
1 --- gst-libs/ext/libav/configure.orig 2011-03-20 23:39:25.000000000 -05002 +++ gst-libs/ext/libav/configure 2011-03-20 23:40:10.000000000 -05003 @@ -1456,9 +1456,9 @@4 5 # toolchain6 ar_default="ar"7 -cc_default="gcc"8 +cc_default="%%CONFIGURE.CC%%"9 cc_version=\"unknown\"10 -host_cc_default="gcc"11 +host_cc_default="%%CONFIGURE.CC%%"12 ln_s="ln -sf"13 nm_default="nm"14 objformat="elf" -
gst-libav/Portfile
1 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 2 # $Id$ 3 4 PortSystem 1.0 5 6 # https://bugzilla.gnome.org/show_bug.cgi?id=636134 7 PortGroup muniversal 1.0 8 9 name gst-libav 10 version 1.0.4 11 description This is gst-libav, a set of plug-ins for GStreamer. 12 long_description ${description} 13 maintainers rmstonecipher openmaintainer 14 categories gnome 15 license GPL-2+ 16 platforms darwin 17 homepage http://www.gnome.org/ 18 master_sites http://gstreamer.freedesktop.org/src/${name}/ 19 20 checksums md5 34d98f4c7a875950525996262bf7dccf \ 21 sha1 4d856e9265b1ffec4171b2e3575557db4c53ed4f \ 22 rmd160 7d850ff47569c8fa08c2adbb054233767d9c4c34 23 24 depends_build port:pkgconfig 25 26 depends_lib port:gst-plugins-base 27 28 use_xz yes 29 30 # This will cause the installed ffmpeg headers to be used, remove it. 31 configure.cppflags-delete -I${prefix}/include 32 33 if {[variant_isset universal]} { 34 set merger_host(x86_64) x86_64-apple-${os.platform}${os.major} 35 set merger_host(i386) i686-apple-${os.platform}${os.major} 36 set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major} 37 set merger_host(ppc) powerpc-apple-${os.platform}${os.major} 38 set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=x86_64\"" 39 set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=ppc\"" 40 set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=ppc64\"" 41 42 if {[string match "*gcc-4.2" ${configure.compiler}] && [lsearch ${universal_archs} i386] != -1} { 43 if {[vercmp ${xcodeversion} 3.2] >= 0} { 44 set merger_configure_compiler(i386) clang 45 set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=[portconfigure::find_developer_tool clang] --arch=i686\"" 46 } else { 47 depends_build port:clang-3.0 48 depends_skip_archcheck-append clang-3.0 49 50 set merger_configure_compiler(i386) macports-clang-3.0 51 52 set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${prefix}/bin/clang-mp-3.0 --arch=i686\"" 53 } 54 } else { 55 set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=i686\"" 56 } 57 } elseif {${build_arch} == "i386"} { 58 if {${configure.compiler} == "gcc-4.2"} { 59 if {[vercmp ${xcodeversion} 3.2] >= 0} { 60 configure.compiler clang 61 } else { 62 depends_build port:clang-3.0 63 depends_skip_archcheck-append clang-3.0 64 configure.compiler macports-clang-3.0 65 } 66 } 67 configure.args-append \ 68 --host=i686-apple-${os.platform}${os.major} \ 69 --build=i686-apple-${os.platform}${os.major} \ 70 --with-ffmpeg-extra-configure="--cc=${configure.cc} --arch=i686" 71 } else { 72 configure.args-append \ 73 --host=${os.arch}-apple-${os.platform}${os.major} \ 74 --build=${os.arch}-apple-${os.platform}${os.major} \ 75 --with-ffmpeg-extra-configure="--cc=${configure.cc} --arch=${os.arch}" 76 } 77 78 # TODO: Is this still needed? 79 # embedded ffmpeg code requires gmake 3.81 to build properly 80 # 81 platform darwin 8 { 82 depends_build-append port:gmake 83 depends_skip_archcheck-append gmake 84 85 build.cmd gmake 86 destroot.cmd gmake 87 } 88 89 livecheck.type regex 90 livecheck.url http://gstreamer.freedesktop.org/src/${name}/ 91 livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" -
gst-plugins-bad/Portfile
Property changes on: gst-libav/Portfile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property
7 7 PortGroup muniversal 1.0 8 8 9 9 name gst-plugins-bad 10 version 0.10.23 11 revision 5 10 version 1.0.4 12 11 description A set of plug-ins for GStreamer that need more quality. 13 12 long_description \ 14 13 GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par compared \ … … 21 20 platforms darwin 22 21 homepage http://gstreamer.freedesktop.org/modules/${name}.html 23 22 master_sites http://gstreamer.freedesktop.org/src/${name}/ 24 use_ bzip2yes23 use_xz yes 25 24 26 checksums md5 fcb09798114461955260e4d940db5987\27 sha1 46208d7bcebaac31310e2a884cc840c51034781a\28 rmd160 3a837843b8aa941ff7c81b90d37930ccb1ddb0be25 checksums md5 5f8dce09342c26bd916affbab5a6a7ff \ 26 sha1 0871580df518da73fd34fc694d79bba98a62b3d6 \ 27 rmd160 d4f99bab7a910a88f6925b1c16786d2d81c040b0 29 28 30 29 depends_build port:pkgconfig 31 30 depends_lib port:gst-plugins-base \ … … 70 69 --enable-experimental \ 71 70 --enable-static 72 71 72 # TODO: osxvideosrc.c:47:10: fatal error: 'gst/interfaces/propertyprobe.h' file not found 73 configure.args-append --disable-osx_video 74 73 75 # 74 76 # port:soundtouch (fails on autoreconf on darwin 8 & 9, see #27533) disable soundtouch on these platforms 75 77 # … … 79 81 configure.args-append --disable-soundtouch 80 82 } 81 83 82 configure.cppflags-append "-L${prefix}/lib"83 configure.cflags-append -funroll-loops -fstrict-aliasing84 84 configure.env-append "HAVE_CXX=yes" 85 85 86 patchfiles modplug.patch \87 patch-sys-applemedia-Makefile.in.diff88 89 post-patch {90 reinplace "s|-flat_namespace -undefined suppress|-undefined define_a_way|g" \91 ${worksrcpath}/configure92 reinplace "s|libSoundTouch|soundtouch-1.0|g" \93 ${worksrcpath}/configure94 }95 96 86 variant no_x11 { 97 87 configure.args-append --disable-examples 98 88 } -
gst-plugins-bad/files/modplug.patch
1 --- ext/modplug/gstmodplug.h.orig 2009-04-19 14:37:08.000000000 -07002 +++ ext/modplug/gstmodplug.h 2009-04-19 14:37:24.000000000 -07003 @@ -22,6 +22,7 @@4 #define __GST_MODPLUG_H__5 6 #include <gst/gst.h>7 +#include <libmodplug/sndfile.h>8 9 G_BEGIN_DECLS10 -
gst-plugins-bad/files/patch-sys-applemedia-Makefile.in.diff
1 --- sys/applemedia/Makefile.in.orig 2012-11-01 21:03:54.000000000 -05002 +++ sys/applemedia/Makefile.in 2012-11-01 21:06:40.000000000 -05003 @@ -246,6 +246,7 @@4 CELT_CFLAGS = @CELT_CFLAGS@5 CELT_LIBS = @CELT_LIBS@6 CFLAGS = @CFLAGS@7 +OBJCFLAGS = @CFLAGS@8 COG_CFLAGS = @COG_CFLAGS@9 COG_LIBS = @COG_LIBS@10 CPP = @CPP@ -
gst-plugins-base/Portfile
7 7 PortGroup muniversal 1.0 8 8 9 9 name gst-plugins-base 10 version 0.10.36 11 revision 2 10 version 1.0.4 12 11 description This is gst-plugins, a set of plug-ins for GStreamer. 13 12 long_description ${description} 14 13 maintainers rmstonecipher openmaintainer … … 17 16 license LGPL-2+ 18 17 homepage http://gstreamer.freedesktop.org/modules/${name}.html 19 18 20 use_ bzip2yes21 master_sites gnome:sources/gst-plugins-base/ 0.10/ http://gstreamer.freedesktop.org/src/${name}/19 use_xz yes 20 master_sites gnome:sources/gst-plugins-base/1.0/ http://gstreamer.freedesktop.org/src/${name}/ 22 21 23 checksums md5 776c73883e567f67b9c4a2847d8d041a\24 sha1 e675401b62a6bf2e5ea966e833afd005a585e978 \25 rmd160 b601372b3a1c04de63f69ba350c5010c99dbc6ae22 checksums md5 3ee91b59cb23632e5a0aa8d36bb5c129 \ 23 sha1 6d4174e5f08c178c02acb1135b7b7fdd17bde848 \ 24 rmd160 023515676c3238e86070f67b0d825401fabe83ff 26 25 26 # TODO: Add libvisual (?) 27 27 28 depends_build \ 28 29 port:pkgconfig 29 30 depends_lib \ 30 31 port:gstreamer \ 31 32 port:gnome-vfs \ 32 33 port:libtheora \ 34 port:libvorbis \ 35 port:libogg \ 33 36 port:openssl \ 34 37 port:orc \ 38 port:pango \ 35 39 port:xorg-libice \ 36 40 port:xorg-libsm 37 41 … … 39 43 --enable-experimental \ 40 44 --disable-examples \ 41 45 --disable-libvisual\ 42 --disable-gst_v4l \43 46 --disable-alsa \ 44 47 --disable-cdparanoia \ 45 48 --disable-ivorbis \ -
gst-plugins-good/Portfile
4 4 PortSystem 1.0 5 5 6 6 # https://bugzilla.gnome.org/show_bug.cgi?id=636134 7 PortGroup muniversal 1.0 7 PortGroup muniversal 1.0 8 PortGroup compiler_blacklist_versions 1.0 8 9 9 10 name gst-plugins-good 10 version 0.10.31 11 revision 6 11 version 1.0.4 12 12 description \ 13 13 A set of good-quality plug-ins for GStreamer under GStreamer's preferred \ 14 14 license, LGPL. … … 24 24 homepage http://gstreamer.freedesktop.org/modules/${name}.html 25 25 master_sites http://gstreamer.freedesktop.org/src/${name}/ gnome:sources/${name}/0.10/ 26 26 27 checksums md5 24f98a294a2b521e1b29412bdadae2e6\28 sha1 b45fc01b133fc23617fa501dd9307a90f467b396\29 rmd160 d9fed957ba26d055f7bccb9079bd43faae15b7e527 checksums md5 7a3f76b68cadafd1588af36f5f261bb8 \ 28 sha1 4afaa6be62cb271b8f086e64aa1dc9d21b807782 \ 29 rmd160 3c00805286bac79ff36fd1c878f221c8e69eecf5 30 30 31 31 depends_build \ 32 32 port:pkgconfig … … 45 45 port:taglib \ 46 46 port:wavpack 47 47 48 use_ bzip2yes48 use_xz yes 49 49 50 50 post-patch { 51 51 # gst/goom is the only thing using this, and its mmx code is buggy (as of 0.10.31) … … 53 53 reinplace "/^MMX_FILES/s|=.*|=|" ${worksrcpath}/gst/goom/Makefile.am 54 54 } 55 55 56 use_autoreconf yes 57 autoreconf.args -fvi 56 configure.args-append --disable-gtk-doc --with-default-videosink=ximagesink 57 configure.env-append "HAVE_CXX=yes" 58 58 59 configure.args-append --disable-gtk-doc --disable-schemas-install --with-default-videosink=ximagesink60 61 59 if {[variant_isset universal]} { 62 60 set merger_host(x86_64) x86_64-apple-${os.platform}${os.major} 63 61 set merger_host(i386) i686-apple-${os.platform}${os.major} … … 74 72 } 75 73 76 74 # SSE register return with SSE disabled 77 # <rdar://problem/9694837> - Fixed in XCode 4.2 78 if {${configure.compiler} == "clang" && [vercmp ${xcodeversion} 4.2] < 0} { 79 configure.compiler llvm-gcc-4.2 80 } 75 # <rdar://problem/9694837> - Fixed in XCode 4.2 (clang 211.10.1) 76 compiler.blacklist {clang < 211.10.1} 81 77 82 78 post-activate { 83 79 system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \ -
gst-plugins-ugly/Portfile
7 7 PortGroup muniversal 1.0 8 8 9 9 name gst-plugins-ugly 10 version 0.10.19 11 revision 5 10 version 1.0.4 12 11 description \ 13 12 A set of good-quality plug-ins for GStreamer that might pose distribution \ 14 13 problems. … … 24 23 master_sites http://gstreamer.freedesktop.org/src/${name}/ 25 24 license GPL-2+ LGPL-2+ 26 25 27 checksums md5 1d81c593e22a6cdf0f2b4f57eae93df2\28 sha1 a28e4e8962f1fe385a098b13249a2b817c44fe63\29 rmd160 39fadcf4205bbe0fd2dc079296c816d8668cc59d26 checksums md5 a40f3da59e420b4efb29f4d69ea324d3 \ 27 sha1 7626b4645733ba98ea7168ce4cf6b09322b5c2ac \ 28 rmd160 62ab3deab853de251d1e172e6d16fe2229b358fd 30 29 31 30 depends_build port:pkgconfig 32 31 depends_lib port:gst-plugins-base \ … … 41 40 port:twolame \ 42 41 port:x264 43 42 44 use_ bzip2yes43 use_xz yes 45 44 46 patchfiles libcdio.patch47 patch.pre_args -p148 49 configure.args mandir=${prefix}/share/man --enable-static50 configure.cppflags-append "-L${prefix}/lib"51 configure.cflags-append -funroll-loops -fstrict-aliasing52 53 # I'm not sure if the pkg-config data is wrong or if gst-plugin is wrong, meh.54 configure.cppflags-append -I${prefix}/include/opencore-amrnb -I${prefix}/include/opencore-amrwb55 56 post-extract {57 reinplace "s|-flat_namespace -undefined suppress|-undefined define_a_way|g" \58 ${worksrcpath}/configure59 }60 61 45 if {[variant_isset universal]} { 62 46 set merger_host(x86_64) x86_64-apple-${os.platform}${os.major} 63 47 set merger_host(i386) i686-apple-${os.platform}${os.major} -
gst-plugins-ugly/files/libcdio.patch
1 From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 20012 From: Leon Merten Lohse <leon@green-side.de>3 Date: Thu, 03 May 2012 22:50:30 +00004 Subject: cdio: compensate for libcdio's recent cd-text api changes5 6 https://bugzilla.gnome.org/show_bug.cgi?id=6751127 8 Conflicts:9 10 ext/cdio/gstcdiocddasrc.c11 ---12 diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c13 index 2f58d18..483ebf5 10064414 --- a/ext/cdio/gstcdio.c15 +++ b/ext/cdio/gstcdio.c16 @@ -30,12 +30,16 @@17 GST_DEBUG_CATEGORY (gst_cdio_debug);18 19 void20 -gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,21 +gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track,22 cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags)23 {24 const gchar *txt;25 26 +#if LIBCDIO_VERSION_NUM > 8327 + txt = cdtext_get_const (cdtext, field, track);28 +#else29 txt = cdtext_get_const (field, cdtext);30 +#endif31 if (txt == NULL || *txt == '\0') {32 GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag);33 return;34 @@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,35 }36 37 GstTagList *38 +#if LIBCDIO_VERSION_NUM > 8339 +gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track)40 +{41 + GstTagList *tags = NULL;42 +43 +#else44 gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)45 {46 GstTagList *tags = NULL;47 @@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)48 GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track);49 return NULL;50 }51 +#endif52 53 - gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags);54 - gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags);55 + gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER,56 + GST_TAG_ARTIST, &tags);57 + gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE,58 + &tags);59 60 return tags;61 }62 63 void64 +#if LIBCDIO_VERSION_NUM > 8365 +gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t,66 + GstTagList * tags)67 +{68 +#else69 gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)70 {71 cdtext_t *t;72 @@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)73 GST_DEBUG_OBJECT (src, "no CD-TEXT for album");74 return;75 }76 +#endif77 78 - /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */79 - gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags);80 - gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags);81 -82 + gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER,83 + GST_TAG_ALBUM_ARTIST, &tags);84 + gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM,85 + &tags);86 + gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE,87 + &tags);88 GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags);89 }90 91 diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h92 index ef31ed0..c6da580 10064493 --- a/ext/cdio/gstcdio.h94 +++ b/ext/cdio/gstcdio.h95 @@ -24,22 +24,38 @@96 #include <gst/gst.h>97 #include <cdio/cdio.h>98 #include <cdio/cdtext.h>99 +#include <cdio/version.h>100 +101 +#if LIBCDIO_VERSION_NUM <= 83102 + #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER103 + #define CDTEXT_FIELD_GENRE CDTEXT_GENRE104 + #define CDTEXT_FIELD_TITLE CDTEXT_TITLE105 +#endif106 107 GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug);108 #define GST_CAT_DEFAULT gst_cdio_debug109 110 void gst_cdio_add_cdtext_field (GstObject * src,111 cdtext_t * cdtext,112 + track_t track,113 cdtext_field_t field,114 const gchar * gst_tag,115 GstTagList ** p_tags);116 117 GstTagList * gst_cdio_get_cdtext (GstObject * src,118 +#if LIBCDIO_VERSION_NUM > 83119 + cdtext_t * t,120 +#else121 CdIo * cdio,122 +#endif123 track_t track);124 125 void gst_cdio_add_cdtext_album_tags (GstObject * src,126 +#if LIBCDIO_VERSION_NUM > 83127 + cdtext_t * t,128 +#else129 CdIo * cdio,130 +#endif131 GstTagList * tags);132 133 #endif /* __GST_CDIO_H__ */134 diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c135 index 615a0c8..830839e 100644136 --- a/ext/cdio/gstcdiocddasrc.c137 +++ b/ext/cdio/gstcdiocddasrc.c138 @@ -218,6 +218,9 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc *139 GstCdioCddaSrc *src;140 discmode_t discmode;141 gint first_track, num_tracks, i;142 +#if LIBCDIO_VERSION_NUM > 83143 + cdtext_t *cdtext;144 +#endif145 146 src = GST_CDIO_CDDA_SRC (cddabasesrc);147 148 @@ -244,8 +247,18 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc *149 if (src->read_speed != -1)150 cdio_set_speed (src->cdio, src->read_speed);151 152 +#if LIBCDIO_VERSION_NUM > 83153 + cdtext = cdio_get_cdtext (src->cdio);154 +155 + if (NULL == cdtext)156 + GST_DEBUG_OBJECT (src, "no CD-TEXT on disc");157 + else158 + gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext,159 + cddabasesrc->tags);160 +#else161 gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio,162 cddabasesrc->tags);163 +#endif164 165 GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track);166 167 @@ -262,8 +275,14 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc *168 * the right thing here (for cddb id calculations etc. as well) */169 track.start = cdio_get_track_lsn (src->cdio, i + first_track);170 track.end = track.start + len_sectors - 1; /* -1? */171 +#if LIBCDIO_VERSION_NUM > 83172 + if (NULL != cdtext)173 + track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext,174 + i + first_track);175 +#else176 track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio,177 i + first_track);178 +#endif179 180 gst_cdda_base_src_add_track (GST_CDDA_BASE_SRC (src), &track);181 } -
gstreamer/Portfile
7 7 PortGroup muniversal 1.0 8 8 9 9 name gstreamer 10 version 0.10.36 11 revision 2 10 version 1.0.4 12 11 description \ 13 12 GStreamer is a library for constructing graphs of media-handling components. 14 13 long_description \ … … 24 23 gnome:sources/gstreamer/[join [lrange [split ${version} .] 0 1] .]/ \ 25 24 http://gstreamer.freedesktop.org/src/${name}/ 26 25 27 checksums md5 a0cf7d6877f694a1a2ad2b4d1ecb890b\28 sha1 ff95b5316b920e7c2836588bba18fa61395fbd03\29 rmd160 5dd01d8ea7afe98e96037bf73f995654f469096e26 checksums md5 781431fac34d63b49ec6ec6b789aba19 \ 27 sha1 2b426321520dfefcd69eeb40e5b68911c31f5287 \ 28 rmd160 7676ca3e2a3499645d79f08aa2a43c0d717e8212 30 29 31 30 depends_build \ 32 31 port:gzip \ … … 40 39 path:lib/pkgconfig/glib-2.0.pc:glib2 \ 41 40 port:libxml2 42 41 43 use_ bzip2yes42 use_xz yes 44 43 45 44 configure.env-append PERL_PATH=${prefix}/bin/perl 46 45 configure.cflags-append -funroll-loops -fstrict-aliasing -fno-common