aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-10-22 07:36:11 +0000
committerRene Ladan <rene@FreeBSD.org>2014-10-22 07:36:11 +0000
commitcec0a95bad73851c0492d47f9462cb4051afd19d (patch)
tree84c6458554c91d7be9e8e483aaf635e7d667a73e
parentd11fa3d44494e1878afcb8e76f29887a2a011b27 (diff)
downloadports-cec0a95bad73851c0492d47f9462cb4051afd19d.tar.gz
ports-cec0a95bad73851c0492d47f9462cb4051afd19d.zip
MFH: r371037
www/chromium - Update to 38.0.2125.104 (bugfix release) - Drop patch which should be fixed in general by https://chromium.googlesource.com/chromium/src/+/084505067895ea2a789b2dc1e033182bc0a0286c%5E%21/#F0 Approved by: portmgr (erwin)
Notes
Notes: svn path=/branches/2014Q4/; revision=371345
-rw-r--r--www/chromium/Makefile5
-rw-r--r--www/chromium/distinfo8
-rw-r--r--www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h11
3 files changed, 6 insertions, 18 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 6891e6651290..a92cb76735aa 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 38.0.2125.101
-PORTREVISION= 2
+PORTVERSION= 38.0.2125.104
CATEGORIES= www
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -168,7 +167,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libusb-pc
.if ${PORT_OPTIONS:MTEST}
.include "Makefile.tests"
-ALL_TARGET+= ${TEST_TARGETS}
+#ALL_TARGET+= ${TEST_TARGETS}
.endif
DEBUG_MAKE_ENV= V=1
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 013407100183..f82305900974 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,4 +1,4 @@
-SHA256 (chromium-38.0.2125.101.tar.xz) = d3303519ab471a3bc831e9b366e64dc2fe651894e52ae5d1e74de60ee2a1198a
-SIZE (chromium-38.0.2125.101.tar.xz) = 248192100
-SHA256 (chromium-38.0.2125.101-testdata.tar.xz) = aca97e1f3d1e4018ef24d7f53c9273b5efde4496f73dc82622184409e9b3076e
-SIZE (chromium-38.0.2125.101-testdata.tar.xz) = 115331828
+SHA256 (chromium-38.0.2125.104.tar.xz) = fcd35aef570d3304798a44f00751aa5724eba775596a8795df1a10a6db83d454
+SIZE (chromium-38.0.2125.104.tar.xz) = 248193372
+SHA256 (chromium-38.0.2125.104-testdata.tar.xz) = 742634a7a42141d0684ba153f525f7889309d9bf876cfc5cd554ac9015c8d8e5
+SIZE (chromium-38.0.2125.104-testdata.tar.xz) = 115335656
diff --git a/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h b/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h
deleted file mode 100644
index 8ea17b8efaeb..000000000000
--- a/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.orig 2014-10-02 17:40:34 UTC
-+++ third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
-@@ -1,7 +1,7 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --arch=i686 --enable-yasm --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic"
-+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --arch=i686 --enable-yasm --extra-cflags='\"-m32,-mstack-alignment=16,-mstackrealign\"' --extra-ldflags='\"-m32\"' --enable-pic"
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2014
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"