[arch-commits] Commit in ffmpeg/trunk (2 files)
Ionut Biru
ibiru at archlinux.org
Tue May 25 23:12:06 UTC 2010
Date: Tuesday, May 25, 2010 @ 19:12:05
Author: ibiru
Revision: 81025
upgpkg: ffmpeg 23328-1
bump to new version, x264 rebuild, remove patch merged upstream
Modified:
ffmpeg/trunk/PKGBUILD
Deleted:
ffmpeg/trunk/fix_metadata_mapping_for_author_artist.patch
----------------------------------------------+
PKGBUILD | 13 --
fix_metadata_mapping_for_author_artist.patch | 122 -------------------------
2 files changed, 4 insertions(+), 131 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-05-25 23:12:01 UTC (rev 81024)
+++ PKGBUILD 2010-05-25 23:12:05 UTC (rev 81025)
@@ -4,7 +4,7 @@
# Contributor: Paul Mattal <paul at archlinux.org>
pkgname=ffmpeg
-pkgver=23065
+pkgver=23328
pkgrel=1
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
arch=('i686' 'x86_64')
@@ -12,19 +12,14 @@
license=('GPL')
depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'faad2>=2.7' 'faac' 'xvidcore' 'zlib' 'x264>=20100410' 'libtheora' 'opencore-amr>=0.1.2' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger>=1.0.9')
makedepends=('yasm')
-options=('force')
-#remake snapshot with: svn export svn://svn.ffmpeg.org/ffmpeg/trunk/@23065
-source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz
- fix_metadata_mapping_for_author_artist.patch)
+#remake snapshot with: svn export svn://svn.ffmpeg.org/ffmpeg/trunk/@23328
+source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz)
#source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2)
-sha256sums=('aa08e743e04a9ec93741ab2f3701b946cb1fcf35440281cfd52ccddf4c52bd97'
- 'f3b16a781366c9fdfe5cbb4a1b53a29b7af30a50a97ba074935a5d856b3be67b')
+sha256sums=('0b9a9452106ee544bb095b1c61870f7b1c1176833220d12ffc52ba5fbf23c18a')
build() {
cd "$srcdir/$pkgname" || return 1
- patch -p0 -i "$srcdir/fix_metadata_mapping_for_author_artist.patch" || return 1
-
./configure \
--prefix=/usr \
--enable-gpl \
Deleted: fix_metadata_mapping_for_author_artist.patch
===================================================================
--- fix_metadata_mapping_for_author_artist.patch 2010-05-25 23:12:01 UTC (rev 81024)
+++ fix_metadata_mapping_for_author_artist.patch 2010-05-25 23:12:05 UTC (rev 81025)
@@ -1,122 +0,0 @@
-Index: ffserver.c
-===================================================================
---- ffserver.c (revision 23065)
-+++ ffserver.c (working copy)
-@@ -2232,7 +2232,7 @@
- switch(c->state) {
- case HTTPSTATE_SEND_DATA_HEADER:
- memset(&c->fmt_ctx, 0, sizeof(c->fmt_ctx));
-- av_metadata_set2(&c->fmt_ctx.metadata, "author" , c->stream->author , 0);
-+ av_metadata_set2(&c->fmt_ctx.metadata, "artist" , c->stream->author , 0);
- av_metadata_set2(&c->fmt_ctx.metadata, "comment" , c->stream->comment , 0);
- av_metadata_set2(&c->fmt_ctx.metadata, "copyright", c->stream->copyright, 0);
- av_metadata_set2(&c->fmt_ctx.metadata, "title" , c->stream->title , 0);
-Index: libavformat/rm.c
-===================================================================
---- libavformat/rm.c (revision 23065)
-+++ libavformat/rm.c (working copy)
-@@ -23,7 +23,7 @@
-
- const char * const ff_rm_metadata[4] = {
- "title",
-- "author",
-+ "artist",
- "copyright",
- "comment"
- };
-Index: libavformat/mov.c
-===================================================================
---- libavformat/mov.c (revision 23065)
-+++ libavformat/mov.c (working copy)
-@@ -144,7 +144,7 @@
- switch (atom.type) {
- case MKTAG(0xa9,'n','a','m'): key = "title"; break;
- case MKTAG(0xa9,'a','u','t'):
-- case MKTAG(0xa9,'A','R','T'): key = "author"; break;
-+ case MKTAG(0xa9,'A','R','T'): key = "artist"; break;
- case MKTAG(0xa9,'w','r','t'): key = "composer"; break;
- case MKTAG( 'c','p','r','t'):
- case MKTAG(0xa9,'c','p','y'): key = "copyright"; break;
-Index: libavformat/vqf.c
-===================================================================
---- libavformat/vqf.c (revision 23065)
-+++ libavformat/vqf.c (working copy)
-@@ -113,7 +113,7 @@
- add_metadata(s, "copyright", len, header_size);
- break;
- case MKTAG('A','U','T','H'):
-- add_metadata(s, "author" , len, header_size);
-+ add_metadata(s, "artist" , len, header_size);
- break;
- case MKTAG('A','L','B','M'):
- add_metadata(s, "album" , len, header_size);
-Index: libavformat/rpl.c
-===================================================================
---- libavformat/rpl.c (revision 23065)
-+++ libavformat/rpl.c (working copy)
-@@ -135,7 +135,7 @@
- error |= read_line(pb, line, sizeof(line)); // date/copyright
- av_metadata_set2(&s->metadata, "copyright", line, 0);
- error |= read_line(pb, line, sizeof(line)); // author and other
-- av_metadata_set2(&s->metadata, "author" , line, 0);
-+ av_metadata_set2(&s->metadata, "artist" , line, 0);
-
- // video headers
- vst = av_new_stream(s, 0);
-Index: libavformat/mp3.c
-===================================================================
---- libavformat/mp3.c (revision 23065)
-+++ libavformat/mp3.c (working copy)
-@@ -215,7 +215,7 @@
- buf[1] = 'A';
- buf[2] = 'G';
- count += id3v1_set_string(s, "title", buf + 3, 30);
-- count += id3v1_set_string(s, "author", buf + 33, 30);
-+ count += id3v1_set_string(s, "artist", buf + 33, 30);
- count += id3v1_set_string(s, "album", buf + 63, 30);
- count += id3v1_set_string(s, "date", buf + 93, 4);
- count += id3v1_set_string(s, "comment", buf + 97, 30);
-Index: libavformat/movenc.c
-===================================================================
---- libavformat/movenc.c (revision 23065)
-+++ libavformat/movenc.c (working copy)
-@@ -1444,7 +1444,7 @@
- put_be32(pb, 0); /* size */
- put_tag(pb, "ilst");
- mov_write_string_metadata(s, pb, "\251nam", "title" , 1);
-- mov_write_string_metadata(s, pb, "\251ART", "author" , 1);
-+ mov_write_string_metadata(s, pb, "\251ART", "artist" , 1);
- mov_write_string_metadata(s, pb, "aART", "album_artist", 1);
- mov_write_string_metadata(s, pb, "\251wrt", "composer" , 1);
- mov_write_string_metadata(s, pb, "\251alb", "album" , 1);
-@@ -1572,7 +1572,7 @@
-
- if (mov->mode & MODE_3GP) {
- mov_write_3gp_udta_tag(pb_buf, s, "titl", "title");
-- mov_write_3gp_udta_tag(pb_buf, s, "auth", "author");
-+ mov_write_3gp_udta_tag(pb_buf, s, "auth", "artist");
- mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre");
- mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment");
- mov_write_3gp_udta_tag(pb_buf, s, "albm", "album");
-@@ -1580,7 +1580,7 @@
- mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date");
- } else if (mov->mode == MODE_MOV) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
- mov_write_string_metadata(s, pb_buf, "\251nam", "title" , 0);
-- mov_write_string_metadata(s, pb_buf, "\251aut", "author" , 0);
-+ mov_write_string_metadata(s, pb_buf, "\251aut", "artist" , 0);
- mov_write_string_metadata(s, pb_buf, "\251alb", "album" , 0);
- mov_write_string_metadata(s, pb_buf, "\251day", "date" , 0);
- mov_write_string_tag(pb_buf, "\251enc", LIBAVFORMAT_IDENT, 0, 0);
-Index: libavformat/aiffdec.c
-===================================================================
---- libavformat/aiffdec.c (revision 23065)
-+++ libavformat/aiffdec.c (working copy)
-@@ -223,7 +223,7 @@
- get_meta(s, "title" , size);
- break;
- case MKTAG('A', 'U', 'T', 'H'): /* Author chunk */
-- get_meta(s, "author" , size);
-+ get_meta(s, "artist" , size);
- break;
- case MKTAG('(', 'c', ')', ' '): /* Copyright chunk */
- get_meta(s, "copyright", size);
More information about the arch-commits
mailing list