Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3adcca43917d23ca03513e338756e2fa670bf484
commit 3adcca43917d23ca03513e338756e2fa670bf484 Author: kikadf <kikadf...@gmail.com> Date: Wed Apr 10 11:47:21 2013 +0200 miro-6.0-1-x86_64 * Version bump diff --git a/source/gnome-extra/miro/FrugalBuild b/source/gnome-extra/miro/FrugalBuild index a729a29..ab51a68 100644 --- a/source/gnome-extra/miro/FrugalBuild +++ b/source/gnome-extra/miro/FrugalBuild @@ -1,18 +1,20 @@ -# Compiling Time: 0.03 SBU +# Compiling Time: 0.12 SBU # Maintainer: kikadf <kikadf...@gmail.com> # Contributor: Devil505 <devil505li...@gmail.com> # Contributor: Priyank Gosalia <priyan...@gmail.com> +options+=('asneeded') + pkgname=miro -pkgver=5.0.4 -pkgrel=4 +pkgver=6.0 +pkgrel=1 pkgdesc="The free and open source internet TV platform." url="http://www.getmiro.com/" -depends=('gtk+2>=2.20.0-2' 'pygtk>=2.16.0-5' 'dbus-python' 'pyrex' \ - 'xine-lib>=1.2.2-1' 'db>=4.7.25' 'bsddb3>=4.7.1' 'nss>=3.12' \ - 'nspr>=4.8.7' 'webkit' 'gnome-python-extras>=2.25.3-5' \ - 'pysqlite2' 'libtorrent-rasterbar>=0.16.9' 'pycurl' 'taglib') -makedepends=('boost>=1.50.0') +rodepends=('mutagen' 'avahi-compat' 'python-gconf' 'curl' 'python-sqlite3' \ + 'gst-plugins-good' 'libtorrent-rasterbar-python>=0.16.9' \ + 'gst-ffmpeg' 'gst-plugins-good-gconf' 'hunspell') +depends=('pygtk' 'pywebkitgtk' 'taglib') +makedepends=('boost>=1.50.0' 'pyrex' 'ffmpeg>=1.0.2') groups=('gnome-extra') archs=('i686' 'x86_64') options=('scriptlet') @@ -21,14 +23,14 @@ _F_gnome_desktop="y" _F_gnome_mime="y" Finclude gnome-scriptlet up2date="lynx -dump 'http://ftp.osuosl.org/pub/pculture.org/miro/src/?C=M;O=A'| Flasttar" -source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/$pkgname-$pkgver.tar.gz ffmpeg.patch) -sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f' \ - '193e6025f2d533bb72723d36637a281610962ae0') +source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/$pkgname-$pkgver.tar.gz) +sha1sums=('96cd4ed4a26e157422e47dfebf491c8a42e54c51') build() { - Fcd - Fpatchall + Fsed 'Videos/Miro' '.miro/Movies' linux/plat/config.py + Fsed 'Desktop' '.miro/Nonvideo' linux/plat/config.py + Fsed './miro.real' '/usr/bin/miro.real' linux/miro PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$Fsrcdir cd linux || Fdie python setup.py install --root=$Fdestdir || Fdie diff --git a/source/gnome-extra/miro/ffmpeg.patch b/source/gnome-extra/miro/ffmpeg.patch deleted file mode 100644 index 9c355d4..0000000 --- a/source/gnome-extra/miro/ffmpeg.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ur a/linux/miro-segmenter.c b/linux/miro-segmenter.c ---- a/linux/miro-segmenter.c 2012-10-04 13:48:31.000000000 -0500 -+++ b/linux/miro-segmenter.c 2012-10-29 01:57:15.432130854 -0500 -@@ -156,7 +156,7 @@ - exit(1); - } - -- ret = av_open_input_file(&ic, input, ifmt, 0, NULL); -+ ret = avformat_open_input(&ic, input, ifmt, 0); - if (ret != 0) { - fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret); - exit(1); -@@ -215,12 +215,7 @@ - } - } - -- if (av_set_parameters(oc, NULL) < 0) { -- fprintf(stderr, "Invalid output format parameters\n"); -- exit(1); -- } -- -- dump_format(oc, 0, input, 1); -+ av_dump_format(oc, 0, input, 1); - - if (video_st) { - codec = avcodec_find_decoder(video_st->codec->codec_id); -@@ -233,12 +228,12 @@ - } - } - -- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - exit(1); - } - -- if (av_write_header(oc)) { -+ if (avformat_write_header(oc, NULL)) { - fprintf(stderr, "Could not write mpegts header to first output file\n"); - - exit(1); -@@ -274,10 +269,10 @@ - } - - if (segment_time - prev_segment_time >= segment_duration) { -- put_flush_packet(oc->pb); -- url_fclose(oc->pb); -+ avio_flush(oc->pb); -+ avio_close(oc->pb); - -- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - break; - } -@@ -307,7 +302,7 @@ - av_freep(&oc->streams[i]); - } - -- url_fclose(oc->pb); -+ avio_close(oc->pb); - av_free(oc); - - /* End-of-transcode marker. */ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git