Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1954 from ayhanyalcinsoy/master

Browse Source 
vlc and lua version bump
This commit is contained in:
Burak Fazil Erturk
2016-06-14 21:10:32 +03:00
committed by GitHub
parent 2b014069c7 6e61900f03
commit 9213ae34f0
45 changed files with 587 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/video/vlc/actions.py
+10 -11
View File
@@ -25,24 +25,20 @@ def setup():
--with-default-font=/usr/share/fonts/dejavu/DejaVuSans.ttf \
--with-default-monospace-font=/usr/share/fonts/dejavu/DejaVuSansMono.ttf \
--with-x \
LUAC=luac \
LUAC=luac LUA_LIBS='`pkg-config --libs lua`' \
RCC=/usr/bin/rcc-qt5 \
--disable-asdcp \
--disable-coverage \
--disable-cprof \
--disable-crystalhd \
--disable-decklink \
--disable-gles1 \
--disable-gles2 \
--disable-goom \
--disable-kai \
--disable-kva \
--disable-maintainer-mode \
--disable-merge-ffmpeg \
--disable-mfx \
--disable-mmal-codec \
--disable-mmal-vout \
--disable-opensles \
--disable-quicktime \
--disable-rpi-omxil \
--disable-shine \
--disable-sndio \
@@ -62,7 +58,8 @@ def setup():
--disable-static \
--disable-update-check \
--disable-silent-rules \
--disable-qt4 \
--disable-mfx \
--enable-ncurses \
--enable-a52 \
--enable-aa \
--enable-alsa \
@@ -91,7 +88,6 @@ def setup():
--enable-mod \
--enable-mpc \
--enable-nls \
--disable-ncurses \
--enable-ogg \
--enable-opus \
--enable-png \
@@ -101,26 +97,29 @@ def setup():
--enable-screen \
--enable-sdl \
--enable-sftp \
--enable-schroedinger \
--enable-shared \
--disable-skins2 \
--enable-smbclient \
--enable-sout \
--enable-speex \
--enable-svg \
--enable-skins2 \
--enable-theora \
--enable-twolame \
--enable-upnp \
--enable-upnp \
--enable-v4l2 \
--enable-vlc \
--enable-vcd \
--enable-mtp \
--enable-vcdx \
--enable-vlm \
--enable-vorbis \
--enable-x264 \
--enable-x265 \
--enable-xvideo \
--enable-qt5 \
")
#enable-skins2 \ --disable-qt4 \
shelltools.export("CFLAGS", "%s -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_1" % get.CFLAGS())
# for fix unused dependency
pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ")
multimedia/video/vlc/files/ffmpeg3.patch
+208
View File
@@ -0,0 +1,208 @@
diff -ruNp vlc-2.2.3.orig/configure.ac vlc-2.2.3/configure.ac
--- vlc-2.2.3.orig/configure.ac 2016-04-05 02:45:40.000000000 +0200
+++ vlc-2.2.3/configure.ac 2016-05-21 19:19:05.527202127 +0200
@@ -2323,9 +2323,6 @@ AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)])
AS_IF([test "${enable_avcodec}" != "no"], [
PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
- PKG_CHECK_EXISTS([libavutil < 55],, [
- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
- ])
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
@@ -2382,9 +2379,6 @@ have_avcodec_vaapi="no"
AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
case "${avfork}" in
ffmpeg)
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
- ])
;;
esac
VLC_SAVE_FLAGS
@@ -2416,9 +2410,6 @@ AS_IF([test "${enable_dxva2}" != "no"],
AS_IF([test "x${have_avcodec}" = "xyes"], [
case "${avfork}" in
ffmpeg)
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
- ])
;;
esac
AC_CHECK_HEADERS(dxva2api.h,
@@ -3180,9 +3171,6 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
case "${avfork}" in
libav) av_vdpau_ver="55.26.0" ;;
ffmpeg) av_vdpau_ver="55.42.100"
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
- ])
;;
esac
PKG_CHECK_EXISTS([libavutil >= 52.4.0 libavcodec >= ${av_vdpau_ver}], [
diff -ruNp vlc-2.2.3.orig/modules/codec/avcodec/audio.c vlc-2.2.3/modules/codec/avcodec/audio.c
--- vlc-2.2.3.orig/modules/codec/avcodec/audio.c 2015-12-08 17:18:56.000000000 +0100
+++ vlc-2.2.3/modules/codec/avcodec/audio.c 2016-05-21 19:19:05.527202127 +0200
@@ -39,7 +39,6 @@
#include <libavcodec/avcodec.h>
#include <libavutil/mem.h>
-#include <libavutil/audioconvert.h>
#include "avcodec.h"
diff -ruNp vlc-2.2.3.orig/modules/codec/avcodec/encoder.c vlc-2.2.3/modules/codec/avcodec/encoder.c
--- vlc-2.2.3.orig/modules/codec/avcodec/encoder.c 2015-10-21 18:36:45.000000000 +0200
+++ vlc-2.2.3/modules/codec/avcodec/encoder.c 2016-05-21 19:19:07.451194268 +0200
@@ -41,7 +41,6 @@
#include <vlc_cpu.h>
#include <libavcodec/avcodec.h>
-#include <libavutil/audioconvert.h>
#include "avcodec.h"
#include "avcommon.h"
@@ -311,7 +310,7 @@ int OpenEncoder( vlc_object_t *p_this )
else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
&psz_namecodec ) )
{
- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
+ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
return VLC_EGENERIC; /* handed chroma output */
i_cat = VIDEO_ES;
@@ -555,7 +554,7 @@ int OpenEncoder( vlc_object_t *p_this )
if( p_codec->pix_fmts )
{
- const enum PixelFormat *p = p_codec->pix_fmts;
+ const enum AVPixelFormat *p = p_codec->pix_fmts;
for( ; *p != -1; p++ )
{
if( *p == p_context->pix_fmt ) break;
@@ -1017,7 +1016,7 @@ errmsg:
}
}
- p_sys->frame = avcodec_alloc_frame();
+ p_sys->frame = av_frame_alloc();
if( !p_sys->frame )
{
goto error;
@@ -1088,7 +1087,7 @@ static block_t *EncodeVideo( encoder_t *
AVFrame *frame = NULL;
if( likely(p_pict) ) {
frame = p_sys->frame;
- avcodec_get_frame_defaults( frame );
+ av_frame_unref( frame );
for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
{
p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
@@ -1329,7 +1328,7 @@ static block_t *handle_delay_buffer( enc
//How much we need to copy from new packet
const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
- avcodec_get_frame_defaults( p_sys->frame );
+ av_frame_unref( p_sys->frame );
p_sys->frame->format = p_sys->p_context->sample_fmt;
p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
@@ -1451,7 +1450,7 @@ static block_t *EncodeAudio( encoder_t *
while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
{
- avcodec_get_frame_defaults( p_sys->frame );
+ av_frame_unref( p_sys->frame );
if( p_sys->b_variable )
p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
else
@@ -1514,7 +1513,7 @@ void CloseEncoder( vlc_object_t *p_this
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys = p_enc->p_sys;
- /*FIXME: we should use avcodec_free_frame, but we don't require so new avcodec that has it*/
+ /*FIXME: we should use av_frame_free, but we don't require so new avcodec that has it*/
av_freep( &p_sys->frame );
vlc_avcodec_lock();
diff -ruNp vlc-2.2.3.orig/modules/codec/avcodec/vaapi.c vlc-2.2.3/modules/codec/avcodec/vaapi.c
--- vlc-2.2.3.orig/modules/codec/avcodec/vaapi.c 2014-11-16 19:57:58.000000000 +0100
+++ vlc-2.2.3/modules/codec/avcodec/vaapi.c 2016-05-21 19:19:07.452194264 +0200
@@ -595,7 +595,7 @@ static int Create( vlc_va_t *p_va, AVCod
return err;
/* Only VLD supported */
- p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
+ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
p_va->setup = Setup;
p_va->get = Get;
p_va->release = Release;
diff -ruNp vlc-2.2.3.orig/modules/codec/avcodec/video.c vlc-2.2.3/modules/codec/avcodec/video.c
--- vlc-2.2.3.orig/modules/codec/avcodec/video.c 2016-04-05 02:45:24.000000000 +0200
+++ vlc-2.2.3/modules/codec/avcodec/video.c 2016-05-21 19:19:07.453194260 +0200
@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * );
static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
#endif
-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
- const enum PixelFormat * );
+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
+ const enum AVPixelFormat * );
static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
{
@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
p_sys->p_codec = p_codec;
p_sys->i_codec_id = i_codec_id;
p_sys->psz_namecodec = psz_namecodec;
- p_sys->p_ff_pic = avcodec_alloc_frame();
+ p_sys->p_ff_pic = av_frame_alloc();
p_sys->b_delayed_open = true;
p_sys->p_va = NULL;
vlc_sem_init( &p_sys->sem_mt, 0 );
@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
if( ffmpeg_OpenCodec( p_dec ) < 0 )
{
msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
- avcodec_free_frame( &p_sys->p_ff_pic );
+ av_frame_free( &p_sys->p_ff_pic );
vlc_sem_destroy( &p_sys->sem_mt );
free( p_sys );
return VLC_EGENERIC;
@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
wait_mt( p_sys );
if( p_sys->p_ff_pic )
- avcodec_free_frame( &p_sys->p_ff_pic );
+ av_frame_free( &p_sys->p_ff_pic );
if( p_sys->p_va )
vlc_va_Delete( p_sys->p_va );
@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
}
#endif
-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
- const enum PixelFormat *pi_fmt )
+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
+ const enum AVPixelFormat *pi_fmt )
{
decoder_t *p_dec = p_context->opaque;
decoder_sys_t *p_sys = p_dec->p_sys;
@@ -1341,6 +1341,15 @@ static enum PixelFormat ffmpeg_GetFormat
if (!can_hwaccel)
goto end;
+#if (LIBAVCODEC_VERSION_MICRO >= 100) /* FFmpeg only */
+ if (p_context->active_thread_type)
+ {
+ msg_Warn(p_dec, "thread type %d: disabling hardware acceleration",
+ p_context->active_thread_type);
+ goto end;
+ }
+#endif
+
/* Profile and level information is needed now.
* TODO: avoid code duplication with avcodec.c */
if( p_context->profile != FF_PROFILE_UNKNOWN)
multimedia/video/vlc/files/lua53_compat.patch
+30
View File
@@ -0,0 +1,30 @@
commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
Author: Vinson Lee <vlee@freedesktop.org>
Date: Thu Feb 5 14:48:53 2015 -0800
lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
In Lua 5.3.0, luaL_checkint was deprecated.
This patch fixes this build error with Lua 5.3.0.
lua/demux.c: In function ‘vlclua_demux_peek’:
lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
int n = luaL_checkint( L, 1 );
^
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
index efd94f1..85c7fc1 100644
--- a/modules/lua/vlc.h
+++ b/modules/lua/vlc.h
@@ -38,6 +38,7 @@
#include <vlc_stream.h>
#include <vlc_demux.h>
+#define LUA_COMPAT_APIINTCASTS
#define LUA_COMPAT_MODULE
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */
multimedia/video/vlc/pspec.xml
+18 -7
View File
@@ -13,12 +13,12 @@
<IsA>app:gui</IsA>
<Summary>VLC media player</Summary>
<Description>VLC is a famous video player and streamer.</Description>
<Archive sha1sum="11f0384980052c7ed73753af2073965f59b27cd2" type="tarxz">http://www.vlc.de/download/vlc/linux/vlc-2.2.0.tar.xz</Archive>
<Archive sha1sum="ec171b0ad731d9d114540cd7b7fcb41fc3293696" type="tarxz">http://mirrors.netix.net/vlc/vlc/2.2.4/vlc-2.2.4.tar.xz</Archive>
<BuildDependencies>
<Dependency>libcdio</Dependency>
<Dependency>libcdio-devel</Dependency>
<Dependency>eudev-devel</Dependency>
<Dependency>lua-devel</Dependency>
<Dependency>libgcrypt</Dependency>
<Dependency>libgcrypt-devel</Dependency>
<Dependency>xcb-proto</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
@@ -87,6 +87,7 @@
<Dependency>openssl-devel</Dependency>
<Dependency>libvorbis-devel</Dependency>
<Dependency>libdc1394-devel</Dependency>
<Dependency>ncurses-devel</Dependency>
<Dependency>libid3tag-devel</Dependency>
<Dependency>sdl-image-devel</Dependency>
<Dependency>libmpcdec-devel</Dependency>
@@ -119,12 +120,14 @@
<Dependency>zvbi-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">ffmpeg3.patch</Patch>
<Patch level="1">lua53_compat.patch</Patch>
<Patch>qt4-select.patch</Patch>
<Patch>lc-2.2.0-fix-xcb.patch</Patch>
<Patch>vlc-2.2.0-rdp-1.2.0.patch</Patch>
<!-- <Patch>lc-2.2.0-fix-xcb.patch</Patch> -->
<!-- <Patch>vlc-2.2.0-rdp-1.2.0.patch</Patch> -->
<Patch level="0">vlc-2.1.1-desktop.patch</Patch>
<Patch level="0">vlc-2.0.4-fix-definition.patch</Patch>
<Patch level="1">vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch</Patch>
<!-- <Patch level="0">vlc-2.0.4-fix-definition.patch</Patch> -->
<!-- <Patch level="1">vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch</Patch> -->
</Patches>
</Source>
@@ -133,6 +136,7 @@
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>qt5-x11extras</Dependency>
<Dependency>ncurses</Dependency>
<Dependency>libtar</Dependency>
<Dependency>libXpm</Dependency>
<Dependency>fribidi</Dependency>
@@ -284,6 +288,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-06-14</Date>
<Version>2.2.4</Version>
<Comment>Version Bump</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>2.2.0</Version>
network/web/chromium-browser/actions.py
+82 -81
View File
@@ -4,106 +4,109 @@
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
WorkDir = "chromium-%s" % get.srcVERSION()
shelltools.export("HOME", get.workDIR())
ARCH = "x64"
def setup():
shelltools.export("LC_ALL", "C")
shelltools.system("sed -i 's|icu)|icu-i18n)|g' build/linux/system.gyp")
shelltools.system("export -n CFLAGS CXXFLAGS")
shelltools.touch(get.workDIR() + "/chromium-48.0.2564.97/chrome/test/data/webui/i18n_process_css_test.html")
shelltools.system("sed -i 's|icu)|icu-i18n)|g' build/linux/system.gyp")
shelltools.system("CFLAGS+=' -fno-delete-null-pointer-checks'")
shelltools.touch(get.workDIR() + "/chromium-*/chrome/test/data/webui/i18n_process_css_test.html")
options = "\
-Duse_system_expat=1 \
-Duse_system_flac=1 \
-Duse_system_harfbuzz=1 \
-Duse_system_icu=0 \
-Duse_system_jsoncpp=1 \
-Duse_system_libevent=1 \
-Duse_system_libjpeg=1 \
-Duse_system_libpng=1 \
-Duse_system_libvpx=0 \
-Duse_system_libwebp=1 \
-Duse_system_opus=1 \
-Duse_system_snappy=1 \
-Duse_system_speex=1 \
-Duse_system_zlib=1 \
-Duse_system_bzip2=1 \
-Dicu_use_data_file_flag=0 \
-Duse_gconf=0 \
-Dclang=0 \
-Dlinux_use_bundled_gold=0 \
-Dlinux_use_bundled_binutils=0 \
-Dlinux_use_gold_flags=0 \
-Dhost_clang=0 \
-Dclang_use_chrome_plugins=0 \
-Dlinux_link_gsettings=1 \
-Dlinux_link_kerberos=1 \
-Dlinux_link_libbrlapi=1 \
-Dlinux_link_libgps=1 \
-Dlinux_link_libpci=1 \
-Dlinux_link_libspeechd=1 \
-Dlinux_link_pulseaudio=1 \
-Dlibspeechd_h_prefix=speech-dispatcher/ \
-Dwerror= \
-Ddisable_fatal_linker_warnings=1 \
-Ddisable_nacl=1 \
-Ddisable_newlib_untar=1 \
-Ddisable_pnacl=1 \
-Ddisable_sse2=1 \
-Ddisable_glibc=1 \
-Dtarget_arch=x64 \
-Dffmpeg_branding=Chromium \
-Dproprietary_codecs=1 \
-Dpython_arch=x64 \
-Dlogging_like_official_build=1 \
-Dlinux_sandbox_chrome_path=/usr/lib/chromium-browser/chromium-browser \
-Dlinux_sandbox_path=/usr/lib/chromium-browser/chromium-sandbox \
-Dgoogle_api_key=AIzaSyBINKL31ZYd8W5byPuwTXYK6cEyoceGh6Y \
-Dgoogle_default_client_id=879512332529.apps.googleusercontent.com \
-Dgoogle_default_client_secret=RmQPJJeL1cNJ8iETnoVD4X17 "
shelltools.system("build/linux/unbundle/replace_gyp_files.py %s" % options)
shelltools.export("GYP_GENERATORS","ninja")
shelltools.system("build/gyp_chromium build/all.gyp --depth=. %s" % options)
-Dwerror= \
-Dclang=0 \
-Dpython_ver=2.7 \
-Dlinux_link_gsettings=1 \
-Dlinux_link_libpci=1 \
-Dlinux_link_libspeechd=1 \
-Dlinux_link_pulseaudio=1 \
-Dlinux_strip_binary=1 \
-Dlinux_use_bundled_binutils=0 \
-Dlinux_use_bundled_gold=0 \
-Dlinux_use_gold_flags=0 \
-Dicu_use_data_file_flag=1 \
-Dlogging_like_official_build=1 \
-Dtracing_like_official_build=1 \
-Dfieldtrial_testing_like_official_build=1 \
-Dlibspeechd_h_prefix=speech-dispatcher/ \
-Dffmpeg_branding=Chrome \
-Dproprietary_codecs=1 \
-Duse_gnome_keyring=0 \
-Duse_system_bzip2=1 \
-Duse_system_flac=1 \
-Duse_system_ffmpeg=0 \
-Duse_system_harfbuzz=1 \
-Duse_system_icu=0 \
-Duse_system_libevent=1 \
-Duse_system_libjpeg=1 \
-Duse_system_libpng=1 \
-Duse_system_libvpx=1 \
-Duse_system_libxml=0 \
-Duse_system_snappy=1 \
-Duse_system_xdg_utils=1 \
-Duse_system_yasm=1 \
-Duse_system_zlib=0 \
-Dusb_ids_path=/usr/share/kcmusb/usb.ids \
-Duse_mojo=0 \
-Duse_gconf=0 \
-Duse_sysroot=0 \
-Denable_hangout_services_extension=1 \
-Denable_widevine=1 \
-Ddisable_fatal_linker_warnings=1 \
-Ddisable_glibc=1 \
-Ddisable_nacl=1 \
-Ddisable_pnacl=1 \
-Dlinux_sandbox_path=/usr/lib/chromium-browser/chromium-sandbox \
-Dlinux_sandbox_chrome_path=/usr/lib/chromium-browser/chromium-browser \
-Drelease_extra_cflags=-fno-ipa-cp \
-Dgoogle_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM \
-Dgoogle_default_client_id=413772536636.apps.googleusercontent.com \
-Dgoogle_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 "
shelltools.system("build/linux/unbundle/replace_gyp_files.py %s" % options)
shelltools.system("build/gyp_chromium build/all.gyp --depth=. %s" % options)
shelltools.export("GYP_GENERATORS","ninja")
def build():
#Sandbox for error must remain separate
shelltools.system("ninja -C out/Release chrome")
shelltools.system("ninja -C out/Release chrome_sandbox")
shelltools.system("ninja -C out/Release chromedriver")
def install():
shelltools.cd("out/Release")
shelltools.makedirs("%s/usr/lib/chromium-browser" % get.installDIR())
binaries_for_inst=["chrome", "chrome_sandbox", "chromedriver", "natives_blob.bin", "snapshot_blob.bin"]
#libraries_for_inst=["libffmpegsumo.so", "icudtl.dat"]
# install and strip binaries
for mybin in binaries_for_inst:
pisitools.insinto("/usr/lib/chromium-browser", mybin)
# install and strip shared libs
# for mylib in libraries_for_inst:
# pisitools.insinto("/usr/lib/chromium-browser", mylib)
pisitools.dosym("/usr/lib/chromium-browser/chrome", "/usr/lib/chromium-browser/chromium-browser")
pisitools.rename("/usr/lib/chromium-browser/chrome_sandbox", "chrome-sandbox")
shelltools.chmod("%s/usr/lib/chromium-browser/chrome-sandbox" % get.installDIR(), 04755)
# install rest of needed files
pisitools.insinto("/usr/lib/chromium-browser", "*.pak")
#should be checked should for the missing folder "out/Release"
pisitools.insinto("/usr/lib/chromium-browser", "chrome")
pisitools.insinto("/usr/lib/chromium-browser", "chromedriver")
pisitools.insinto("/usr/lib/chromium-browser", "chrome_sandbox", "chrome-sandbox")
pisitools.insinto("/usr/lib/chromium-browser", "locales")
pisitools.insinto("/usr/lib/chromium-browser", "resources")
pisitools.insinto("/usr/lib/chromium-browser", "natives_blob.bin")
pisitools.insinto("/usr/lib/chromium-browser", "snapshot_blob.bin")
pisitools.insinto("/usr/lib/chromium-browser", "icudtl.dat")
pisitools.insinto("/usr/lib/chromium-browser", "*.pak")
pisitools.insinto("/usr/lib/chromium-browser", "character_data_generator")
pisitools.insinto("/usr/lib/chromium-browser", "*.json")
pisitools.insinto("/usr/lib/chromium-browser", "mksnapshot")
pisitools.dosym("/usr/lib/chromium-browser/chrome", "/usr/bin/chromium-browser")
shelltools.system("chmod -v 4755 %s/usr/lib/chromium-browser/chrome-sandbox" %get.installDIR())
pisitools.newman("chrome.1", "chromium-browser.1")
@@ -115,5 +118,3 @@ def install():
pisitools.dodoc("LICENSE")
network/web/chromium-browser/files/PNGImageDecoder.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cppg 2016-05-01 15:22:46.103607522 +0800
+++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp 2016-05-01 15:25:14.459753876 +0800
@@ -234,7 +234,7 @@
#endif
png_uint_32 profileLength = 0;
if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
- setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
+ setColorProfileAndTransform((const char*)profile, profileLength, imageHasAlpha, false /* useSRGB */);
}
}
#endif // PNG_iCCP_SUPPORTED
network/web/chromium-browser/files/arch/chromium-webkit-buffer-overflow.patch
-24
View File
@@ -1,24 +0,0 @@
diff --git a/Source/platform/fonts/shaping/HarfBuzzShaper.cpp b/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
index 87441d9..a90b925 100644
--- third_party/WebKit//Source/platform/fonts/shaping/HarfBuzzShaper.cpp
+++ third_party/WebKit//Source/platform/fonts/shaping/HarfBuzzShaper.cpp
@@ -702,7 +702,7 @@ static inline void resolveRunBasedOnScriptValue(Vector<CandidateRun>& runs,
static inline bool resolveCandidateRuns(Vector<CandidateRun>& runs)
{
- UScriptCode scriptExtensions[8];
+ UScriptCode scriptExtensions[USCRIPT_CODE_LIMIT];
UErrorCode errorCode = U_ZERO_ERROR;
size_t length = runs.size();
size_t nextResolvedRun = 0;
@@ -714,7 +714,8 @@ static inline bool resolveCandidateRuns(Vector<CandidateRun>& runs)
run.script = i > 0 ? runs[i - 1].script : USCRIPT_COMMON;
int extensionsLength = uscript_getScriptExtensions(run.character,
- scriptExtensions, sizeof(scriptExtensions), &errorCode);
+ scriptExtensions, sizeof(scriptExtensions) / sizeof(scriptExtensions[0]),
+ &errorCode);
if (U_FAILURE(errorCode))
return false;
network/web/chromium-browser/files/chromium-browser.desktop
+2 -1
View File
@@ -1,3 +1,4 @@
#!/usr/bin/env xdg-open
[Desktop Entry]
Version=1.0
Encoding=UTF-8
@@ -102,7 +103,7 @@ Comment[vi]=Truy cập Internet
Comment[zh_CN]=访问互联网
Comment[zh_HK]=連線到網際網路
Comment[zh_TW]=連線到網際網路
Exec=chromium-browser %U --ppapi-flash-path=/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so --ppapi-flash-version=18.0.0.233
Exec=chromium-browser %U
Terminal=false
Icon=chromium-browser
Type=Application
network/web/chromium-browser/files/chromium-browser.sh
+3 -3
View File
@@ -1,4 +1,4 @@
#!/bin/sh
export CHROME_WRAPPER=/usr/lib/chromium-browser/chromium-browser
export CHROME_DESKTOP=chromium-browser.desktop
exec /usr/lib/chromium-browser/chromium-browser "$@"
export CHROME_WRAPPER=/usr/lib/chromium/chromium
export CHROME_DESKTOP=chromium.desktop
exec /usr/lib/chromium/chromium "$@"
network/web/chromium-browser/files/chromium-widevine.patch
+53
View File
@@ -0,0 +1,53 @@
diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc chromium-48.0.2564.82/chrome/common/chrome_content_client.cc
--- chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc 2016-01-20 22:01:20.000000000 +0200
+++ chromium-48.0.2564.82/chrome/common/chrome_content_client.cc 2016-01-21 20:02:02.788936626 +0200
@@ -158,7 +158,12 @@ void ComputeBuiltInPlugins(std::vector<c
#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
!defined(WIDEVINE_CDM_IS_COMPONENT)
static bool skip_widevine_cdm_file_check = false;
- if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
+ bool widevine_cdm_present =
+ skip_widevine_cdm_file_check ||
+ (PathService::Get(chrome::FILE_WIDEVINE_CDM, &path) &&
+ base::PathExists(path));
+ if (widevine_cdm_present &&
+ PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
if (skip_widevine_cdm_file_check || base::PathExists(path)) {
content::PepperPluginInfo widevine_cdm;
widevine_cdm.is_out_of_process = true;
diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc chromium-48.0.2564.82/chrome/common/chrome_paths.cc
--- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc 2016-01-20 22:01:20.000000000 +0200
+++ chromium-48.0.2564.82/chrome/common/chrome_paths.cc 2016-01-21 19:18:51.287978456 +0200
@@ -375,6 +375,11 @@ bool PathProvider(int key, base::FilePat
return false;
cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
break;
+ case chrome::FILE_WIDEVINE_CDM:
+ if (!GetInternalPluginsDirectory(&cur))
+ return false;
+ cur = cur.AppendASCII(kWidevineCdmFileName);
+ break;
#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
case chrome::FILE_RESOURCES_PACK:
#if defined(OS_MACOSX) && !defined(OS_IOS)
diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h chromium-48.0.2564.82/chrome/common/chrome_paths.h
--- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h 2016-01-14 03:49:22.000000000 +0200
+++ chromium-48.0.2564.82/chrome/common/chrome_paths.h 2016-01-21 19:18:51.287978456 +0200
@@ -99,6 +99,7 @@ enum {
DIR_COMPONENT_WIDEVINE_CDM, // Directory that contains component-updated
// Widevine CDM files.
FILE_WIDEVINE_CDM_ADAPTER, // Full path to the Widevine CDM adapter file.
+ FILE_WIDEVINE_CDM, // Full path to the Widevine CDM file.
FILE_RESOURCES_PACK, // Full path to the .pak file containing
// binary data (e.g., html files and images
// used by internal pages).
diff -upr chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h
--- chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-14 01:05:17.000000000 +0200
+++ chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-21 19:18:51.287978456 +0200
@@ -12,4 +12,6 @@
#define WIDEVINE_CDM_AVAILABLE
+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
+
#endif // WIDEVINE_CDM_VERSION_H_
network/web/chromium-browser/files/fedora/webui-error.patch
-11
View File
@@ -1,11 +0,0 @@
diff -up chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd.542819fix chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd
--- chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd.542819fix 2015-10-14 10:47:17.568757249 -0400
+++ chromium-46.0.2490.80/chrome/test/data/webui_test_resources.grd 2015-10-14 10:48:01.196466805 -0400
@@ -8,7 +8,6 @@
</outputs>
<release seq="1">
<includes>
- <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
</includes>
</release>
</grit>
network/web/chromium-browser/files/gentoo/chromium-cups-r0.patch
-71
View File
@@ -1,71 +0,0 @@
Index: printing/backend/print_backend.h
diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
index e03ef42e37cf0785ba735f4a241310f70125a6e7..a8123325a613f527ba4e91a412ba09cd3225c8ec 100644
--- a/printing/backend/print_backend.h
+++ b/printing/backend/print_backend.h
@@ -111,7 +111,6 @@ class PRINTING_EXPORT PrintBackend
// Allocate a print backend. If |print_backend_settings| is NULL, default
// settings will be used.
- // Return NULL if no print backend available.
static scoped_refptr<PrintBackend> CreateInstance(
const base::DictionaryValue* print_backend_settings);
Index: printing/backend/print_backend_dummy.cc
diff --git a/printing/backend/print_backend_dummy.cc b/printing/backend/print_backend_dummy.cc
index c73e5370720eda7a2f989401f37dc62c5e438e24..db269a75920d3c44381c87d67b91d923f0bfd8dc 100644
--- a/printing/backend/print_backend_dummy.cc
+++ b/printing/backend/print_backend_dummy.cc
@@ -13,10 +13,49 @@
namespace printing {
+class DummyPrintBackend : public PrintBackend {
+ public:
+ DummyPrintBackend() {
+ }
+
+ bool EnumeratePrinters(PrinterList* printer_list) override {
+ return false;
+ }
+
+ std::string GetDefaultPrinterName() override {
+ return std::string();
+ }
+
+ bool GetPrinterSemanticCapsAndDefaults(
+ const std::string& printer_name,
+ PrinterSemanticCapsAndDefaults* printer_info) override {
+ return false;
+ }
+
+ bool GetPrinterCapsAndDefaults(
+ const std::string& printer_name,
+ PrinterCapsAndDefaults* printer_info) override {
+ return false;
+ }
+
+ std::string GetPrinterDriverInfo(
+ const std::string& printer_name) override {
+ return std::string();
+ }
+
+ bool IsValidPrinter(const std::string& printer_name) override {
+ return false;
+ }
+
+ private:
+ ~DummyPrintBackend() {}
+
+ DISALLOW_COPY_AND_ASSIGN(DummyPrintBackend);
+};
+
scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
const base::DictionaryValue* print_backend_settings) {
- NOTREACHED();
- return NULL;
+ return new DummyPrintBackend();
}
} // namespace printing
network/web/chromium-browser/files/gentoo/chromium-gcc-4.7-r0.patch
-13
View File
@@ -1,13 +0,0 @@
--- mojo/public/c/system/macros.h.orig 2014-09-03 14:48:42.963665035 +0000
+++ mojo/public/c/system/macros.h 2014-09-03 14:49:12.180255593 +0000
@@ -76,7 +76,8 @@
// Unlike the C++11 |alignas()|, |alignment| must be an integer. It may not be a
// type, nor can it be an expression like |MOJO_ALIGNOF(type)| (due to the
// non-C++11 MSVS version).
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L && \
+ (defined(__clang__) || (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 >= 40800))
#define MOJO_ALIGNAS(alignment) alignas(alignment)
#elif defined(__GNUC__)
#define MOJO_ALIGNAS(alignment) __attribute__((aligned(alignment)))
network/web/chromium-browser/files/gentoo/chromium-gnome-r0.patch
-40
View File
@@ -1,40 +0,0 @@
Index: ui/accessibility/platform/atk_util_auralinux.cc
diff --git a/ui/accessibility/platform/atk_util_auralinux.cc b/ui/accessibility/platform/atk_util_auralinux.cc
index a15df08137d874609305f90a6bca6e5c15e5c213..7fcaf219351289fe7eba1f670d7a6743a8b40ddc 100644
--- a/ui/accessibility/platform/atk_util_auralinux.cc
+++ b/ui/accessibility/platform/atk_util_auralinux.cc
@@ -3,7 +3,9 @@
// found in the LICENSE file.
#include <atk/atk.h>
+#if defined(USE_GCONF)
#include <gconf/gconf-client.h>
+#endif
#include <glib-2.0/gmodule.h>
#include "base/files/file_path.h"
@@ -14,6 +16,8 @@
namespace {
+#if defined(USE_GCONF)
+
const char kGnomeAccessibilityEnabledKey[] =
"/desktop/gnome/interface/accessibility";
@@ -39,6 +43,15 @@ bool ShouldEnableAccessibility() {
return value;
}
+#else // !defined(USE_GCONF)
+
+bool ShouldEnableAccessibility() {
+ // TODO(k.czech): implement this for non-GNOME desktops.
+ return false;
+}
+
+#endif // defined(USE_GCONF)
+
} // namespace
G_BEGIN_DECLS
network/web/chromium-browser/files/gentoo/chromium-hotwording-2403.patch
-146
View File
@@ -1,146 +0,0 @@
From c2a0c6df7d468da9864c56f2099aa947b07e2535 Mon Sep 17 00:00:00 2001
From: amistry <amistry@chromium.org>
Date: Tue, 9 Jun 2015 12:18:39 -0700
Subject: [PATCH] Add build flag to disable hotwording.
Hotwording downloads a shared module from the web store containing a NaCl module. There is a desire to build and distribute Chromium without this happening. This change adds an "enable_hotwording" build flag that is enabled by default, but can be disabled at compile time.
BUG=491435
Review URL: https://codereview.chromium.org/1160243004
Cr-Commit-Position: refs/heads/master@{#333548}
Conflicts:
chrome/browser/search/hotword_service.cc
---
build/common.gypi | 4 ++++
chrome/browser/BUILD.gn | 9 +++++++++
chrome/browser/search/hotword_service.cc | 4 ++++
chrome/browser/search/hotword_service_unittest.cc | 4 ++++
chrome/chrome_browser.gypi | 3 +++
5 files changed, 24 insertions(+)
diff --git a/build/common.gypi b/build/common.gypi
index 339cc75..ddb075c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -381,6 +381,9 @@
# Web speech is enabled by default. Set to 0 to disable.
'enable_web_speech%': 1,
+ # 'Ok Google' hotwording is enabled by default. Set to 0 to disable.
+ 'enable_hotwording%': 1,
+
# Notifications are compiled in by default. Set to 0 to disable.
'notifications%' : 1,
@@ -1134,6 +1137,7 @@
'configuration_policy%': '<(configuration_policy)',
'safe_browsing%': '<(safe_browsing)',
'enable_web_speech%': '<(enable_web_speech)',
+ 'enable_hotwording%': '<(enable_hotwording)',
'notifications%': '<(notifications)',
'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
'mac_want_real_dsym%': '<(mac_want_real_dsym)',
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 5152d83..6ccb079 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -18,6 +18,11 @@ if (is_desktop_linux) {
import("//build/config/linux/pkg_config.gni")
}
+declare_args() {
+ # 'Ok Google' hotwording is enabled.
+ enable_hotwording = true
+}
+
about_credits_file = "$target_gen_dir/about_credits.html"
additional_modules_list_file =
"$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
@@ -455,6 +460,10 @@ source_set("browser") {
}
}
+ if (enable_hotwording) {
+ defines += [ "ENABLE_HOTWORDING" ]
+ }
+
if (is_linux) {
deps += [
"//device/media_transfer_protocol",
diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
index 0cf3c60..e93789b 100644
--- a/chrome/browser/search/hotword_service.cc
+++ b/chrome/browser/search/hotword_service.cc
@@ -642,6 +642,7 @@ bool HotwordService::IsServiceAvailable() {
}
bool HotwordService::IsHotwordAllowed() {
+#if defined(ENABLE_HOTWORDING)
std::string group = base::FieldTrialList::FindFullName(
hotword_internal::kHotwordFieldTrialName);
// Allow hotwording by default, and only disable if the field trial has been
@@ -650,6 +651,9 @@ bool HotwordService::IsHotwordAllowed() {
return false;
return DoesHotwordSupportLanguage(profile_);
+#else
+ return false;
+#endif
}
bool HotwordService::IsOptedIntoAudioLogging() {
diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
index a3aef47..b0b5927 100644
--- a/chrome/browser/search/hotword_service_unittest.cc
+++ b/chrome/browser/search/hotword_service_unittest.cc
@@ -216,6 +216,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedInvalidFieldTrial) {
}
TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
+#if defined(ENABLE_HOTWORDING)
TestingProfile::Builder profile_builder;
scoped_ptr<TestingProfile> profile = profile_builder.Build();
@@ -246,6 +247,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
Profile* otr_profile = profile->GetOffTheRecordProfile();
SetApplicationLocale(otr_profile, "en");
EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(otr_profile));
+#endif // defined(ENABLE_HOTWORDING)
}
TEST_P(HotwordServiceTest, ShouldReinstallExtension) {
@@ -302,6 +304,7 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) {
}
TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
+#if defined(ENABLE_HOTWORDING)
InitializeEmptyExtensionService();
service_->Init();
@@ -372,6 +375,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile()));
EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
EXPECT_EQ(1, hotword_service->uninstall_count()); // no change
+#endif // defined(ENABLE_HOTWORDING)
}
TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6d323eb..1aaedba 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3529,6 +3529,9 @@
['enable_session_service==1', {
'sources': [ '<@(chrome_browser_session_service_sources)' ],
}],
+ ['enable_hotwording==1', {
+ 'defines': [ 'ENABLE_HOTWORDING' ],
+ }],
['OS!="android" and OS!="ios" and chromeos==0', {
'sources': [ '<@(chrome_browser_desktop_sources)' ],
}],
--
2.4.4
network/web/chromium-browser/files/gentoo/chromium-libsecret-r0.patch
-15
View File
@@ -1,15 +0,0 @@
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index af7c775..e32fd13 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3246,6 +3246,9 @@
'defines': [
'USE_LIBSECRET',
],
+ 'cflags': [
+ '<!@(pkg-config --cflags libsecret-1)',
+ ],
}],
['use_aura==1', {
'sources': [ '<@(chrome_browser_aura_sources)' ],
network/web/chromium-browser/files/gentoo/chromium-system-jinja-r7.patch
-36
View File
@@ -1,36 +0,0 @@
--- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000
+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000
@@ -54,7 +54,6 @@
'actions': [{
'action_name': 'cache_jinja_templates',
'inputs': [
- '<@(jinja_module_files)',
'code_generator_v8.py',
'<@(code_generator_template_files)',
],
--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000
+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000
@@ -2,10 +2,6 @@
{
'variables': {
'scripts_for_in_files': [
- # jinja2/__init__.py contains version string, so sufficient as
- # dependency for whole jinja2 package
- '<(DEPTH)/third_party/jinja2/__init__.py',
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
'hasher.py',
'in_file.py',
'in_generator.py',
--- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000
+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000
@@ -12,9 +12,6 @@
'<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
],
'idl_lexer_parser_files': [
- # PLY (Python Lex-Yacc)
- '<(DEPTH)/third_party/ply/lex.py',
- '<(DEPTH)/third_party/ply/yacc.py',
# Web IDL lexer/parser (base parser)
'<(DEPTH)/tools/idl_parser/idl_lexer.py',
'<(DEPTH)/tools/idl_parser/idl_node.py',
network/web/chromium-browser/files/gentoo/chromium-system-libvpx-r0.patch
-10
View File
@@ -1,10 +0,0 @@
--- build/linux/unbundle/libvpx.gyp.orig 2015-04-08 09:25:29.605925761 +0000
+++ build/linux/unbundle/libvpx.gyp 2015-04-08 09:27:19.932142216 +0000
@@ -24,6 +24,7 @@
'vpx/vpx_integer.h',
'vpx/vp8dx.h',
'vpx/vpx_encoder.h',
+ 'vpx/vpx_frame_buffer.h',
],
},
'includes': [
network/web/chromium-browser/files/gentoo/chromium-widevine.patch
-31
View File
@@ -1,31 +0,0 @@
--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h.orig 2014-12-10 05:36:13.000000000 +0100
+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h 2014-12-28 20:47:39.080795240 +0100
@@ -14,4 +14,8 @@
// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
// as a string, e.g., "1.0.123.456").
+#include "third_party/widevine/cdm/widevine_cdm_common.h"
+#define WIDEVINE_CDM_AVAILABLE
+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
+
#endif // WIDEVINE_CDM_VERSION_H_
--- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp.orig 2014-12-10 05:54:35.000000000 +0100
+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp 2014-12-28 20:50:48.163269989 +0100
@@ -7,7 +7,7 @@
'widevine_cdm_version_h_file%': 'widevine_cdm_version.h',
'widevine_cdm_binary_files%': [],
'conditions': [
- [ 'branding == "Chrome"', {
+ [ 'branding == "Chromium"', {
'conditions': [
[ 'chromeos == 1', {
'widevine_cdm_version_h_file%':
@@ -54,7 +54,7 @@
'target_name': 'widevinecdmadapter',
'type': 'none',
'conditions': [
- [ 'branding == "Chrome" and enable_pepper_cdms==1', {
+ [ 'branding == "Chromium" and enable_pepper_cdms==1', {
'dependencies': [
'<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
'<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',
network/web/chromium-browser/files/master_preferences
Executable → Regular
View File
network/web/chromium-browser/files/naclsdk_pnacl_translator.tgz.sha1hash
-1
View File
@@ -1 +0,0 @@
33a38183e0f94df38e14b6ecff545d89fbc5fc26
network/web/chromium-browser/files/opensuse/adjust-ldflags-no-keep-memory.patch
-17
View File
@@ -1,17 +0,0 @@
--- chrome/chrome_exe.gypi.ldflags 2012-06-28 09:02:24.000000000 -0400
+++ chrome/chrome_exe.gypi 2012-07-06 15:46:13.008003437 -0400
@@ -25,6 +25,14 @@
'<(DEPTH)/content/app/startup_helper_win.cc',
'<(DEPTH)/content/public/common/content_switches.cc',
],
+ # Hey, I know what would be an awesome idea.
+ # Let us statically compile EVERYTHING into one giant
+ # freaking executable. Too bad this means we can't build
+ # natively on an IA32 machine. If only someone would
+ # invent shared library objects. Idiots.
+ 'ldflags': [
+ '-Wl,--no-keep-memory'
+ ],
'mac_bundle_resources': [
'app/app-Info.plist',
],
network/web/chromium-browser/files/opensuse/chromium-gcc-fixes.patch
-25
View File
@@ -1,25 +0,0 @@
Index: chromium/src/base/debug/stack_trace.h
===================================================================
--- base/debug/stack_trace.h
+++ base/debug/stack_trace.h
@@ -5,6 +5,7 @@
#ifndef BASE_DEBUG_STACK_TRACE_H_
#define BASE_DEBUG_STACK_TRACE_H_
+#include <stdint.h>
#include <iosfwd>
#include <string>
Index: chromium/src/third_party/skia/src/ports/SkFontHost_fontconfig.cpp
===================================================================
--- third_party/skia/src/ports/SkFontHost_fontconfig.cpp
+++ third_party/skia/src/ports/SkFontHost_fontconfig.cpp
@@ -14,6 +14,7 @@
#include "SkStream.h"
#include "SkTypeface.h"
#include "SkTypefaceCache.h"
+#include <unistd.h>
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
network/web/chromium-browser/files/opensuse/chromium-master-prefs-path.patch
-14
View File
@@ -1,14 +0,0 @@
Index: chromium/src/chrome/browser/first_run/first_run_linux.cc
===================================================================
--- chrome/browser/first_run/first_run_internal_linux.cc
+++ chrome/browser/first_run/first_run_internal_linux.cc
@@ -22,8 +22,7 @@
base::FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
base::FilePath master_prefs;
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
- return base::FilePath();
+ master_prefs = base::FilePath("/etc/chromium");
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
}
network/web/chromium-browser/files/opensuse/chromium-more-codec-aliases.patch
-17
View File
@@ -1,17 +0,0 @@
Index: src/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
===================================================================
--- third_party/WebKit/Source/wtf/text/TextCodecICU.cpp (revision 101168)
+++ third_party/WebKit/Source/wtf/text/TextCodecICU.cpp (working copy)
@@ -203,7 +203,11 @@
registrar("iso_8859-6", "ISO-8859-6");
registrar("iso_8859-7", "ISO-8859-7");
registrar("iso_8859-8", "ISO-8859-8");
+ registrar("ISO_8859-8-I", "ISO-8859-8-I");
registrar("iso_8859-9", "windows-1254");
+ registrar("ISO_8859-10", "ISO-8859-10");
+ registrar("ISO_8859-13", "ISO-8859-13");
+ registrar("ISO_8859-14", "ISO-8859-14");
registrar("iso_8859-15", "ISO-8859-15");
registrar("koi8_r", "KOI8-R");
registrar("x-cp1253", "windows-1253");
network/web/chromium-browser/files/opensuse/chromium-sandbox-pie.patch
-14
View File
@@ -1,14 +0,0 @@
--- sandbox/linux/sandbox_linux.gypi 2011-11-15 19:35:11.119851877 +0100
+++ sandbox/linux/sandbox_linux.gypi 2012-01-25 23:24:53.914568688 +0100
@@ -85,7 +85,10 @@
],
'cflags': [
# For ULLONG_MAX
- '-std=gnu99',
+ '-std=gnu99 -fPIE',
+ ],
+ 'ldflags': [
+ '-pie',
],
'include_dirs': [
'../..',
network/web/chromium-browser/files/opensuse/exclude_ymp.diff
-10
View File
@@ -1,10 +0,0 @@
--- net/base/mime_util.cc 2013-08-25 10:12:05.428599992 +0200
+++ net/base/mime_util.cc 2013-08-25 10:12:05.428599992 +0200
@@ -376,6 +376,7 @@
"text/x-csv",
"text/x-vcf",
"text/rtf",
+ "text/x-pisi-ymp",
"text/comma-separated-values",
"text/csv",
"text/tab-separated-values",
network/web/chromium-browser/files/opensuse/no-clang-on-packman.diff
-20
View File
@@ -1,20 +0,0 @@
--- build/common.gypi 2014-08-29 13:04:19.000000000 +0200
+++ build/common.gypi 2014-08-29 13:04:19.000000000 +0200
@@ -2440,7 +2440,7 @@
}],
],
'clang_warning_flags': [
- '-Wheader-hygiene',
+ # '-Wheader-hygiene',
# Don't die on dtoa code that uses a char as an array index.
# This is required solely for base/third_party/dmg_fp/dtoa.cc.
@@ -2456,7 +2456,7 @@
'-Wno-covered-switch-default',
# Warns when a const char[] is converted to bool.
- '-Wstring-conversion',
+ # '-Wstring-conversion',
# C++11-related flags:
network/web/chromium-browser/files/pisilinux/fix_build_with_newer_gcc.patch
+57
View File
@@ -0,0 +1,57 @@
diff --git a/third_party/WebKit/Source/wtf/dtoa/bignum.cc b/third_party/WebKit/S
index a000b46..6c6d336 100644
--- a/third_party/WebKit/Source/wtf/dtoa/bignum.cc
+++ b/third_party/WebKit/Source/wtf/dtoa/bignum.cc
-@@ -109,7 +109,10 @@ namespace double_conversion {
- int length = value.length();
- int pos = 0;
- // Let's just say that each digit needs 4 bits.
+@@ -102,7 +102,10 @@
+ }
+
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic warning "-Wstrict-overflow"
- while (length >= kMaxUint64DecimalDigits) {
+ void Bignum::AssignDecimalString(Vector<const char> value) {
+#pragma GCC diagnostic pop
- uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits);
- pos += kMaxUint64DecimalDigits;
- length -= kMaxUint64DecimalDigits;
+ // 2^64 = 18446744073709551616 > 10^19
+ const int kMaxUint64DecimalDigits = 19;
+ Zero();
--
1.8.4.5
-
diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc
index 89a3f8c..d595da3 100644
--- a/ui/gfx/image/image_util.cc
+++ b/ui/gfx/image/image_util.cc
-@@ -68,7 +68,10 @@ bool VisibleMargins(const ImageSkia& image, int* leading, int* trailing) {
- int inner_min = bitmap.width();
- for (int x = 0; x < bitmap.width(); ++x) {
- for (int y = 0; y < bitmap.height(); ++y) {
+@@ -47,7 +47,10 @@
+ }
+ #endif // !defined(OS_IOS)
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic warning "-Wstrict-overflow"
- if (SkColorGetA(bitmap.getColor(x, y)) > kMinimumVisibleOpacity) {
+ bool VisibleMargins(const ImageSkia& image, int* leading, int* trailing) {
+#pragma GCC diagnostic pop
- inner_min = x;
- break;
- }
+ *leading = 0;
+ *trailing = std::max(1, image.width()) - 1;
+ if (!image.HasRepresentation(1.0))
--
1.8.4.5
-
--
2.7.1
network/web/chromium-browser/files/pisilinux/gfx_jpeg_codec.patch
+48
View File
@@ -0,0 +1,48 @@
diff -Naur orig/ui/gfx/codec/jpeg_codec.cc patched/ui/gfx/codec/jpeg_codec.cc
--- orig/ui/gfx/codec/jpeg_codec.cc 2016-04-24 21:31:31.000000000 +0200
+++ patched/ui/gfx/codec/jpeg_codec.cc 2016-06-13 23:43:36.809948082 +0200
@@ -120,7 +120,7 @@
// tell libjpeg where to write the next data
cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
- return 1;
+ return TRUE;
}
// Cleans up the JpegEncoderState to prepare for returning in the final form.
@@ -266,7 +266,7 @@
cinfo.data_precision = 8;
jpeg_set_defaults(&cinfo);
- jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100
+ jpeg_set_quality(&cinfo, quality, TRUE); // quality here is 0-100
// set up the destination manager
jpeg_destination_mgr destmgr;
@@ -278,7 +278,7 @@
JpegEncoderState state(output);
cinfo.client_data = &state;
- jpeg_start_compress(&cinfo, 1);
+ jpeg_start_compress(&cinfo, TRUE);
// feed it the rows, doing necessary conversions for the color format
#ifdef JCS_EXTENSIONS
@@ -364,7 +364,7 @@
// set to a positive value if TRUE is returned. A FALSE return should only
// be used when I/O suspension is desired."
boolean FillInputBuffer(j_decompress_ptr cinfo) {
- return false;
+ return FALSE;
}
// Skip data in the buffer. Since we have all the data at once, this operation
@@ -496,7 +496,7 @@
cinfo.client_data = &state;
// fill the file metadata into our buffer
- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
+ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
return false;
// we want to always get RGB data out
network/web/chromium-browser/files/pld-linux/angle.patch
-12
View File
@@ -1,12 +0,0 @@
--- chromium-browser-42.0.2311.82/third_party/angle/src/angle.gyp~ 2015-04-09 00:14:43.000000000 +0300
+++ chromium-browser-42.0.2311.82/third_party/angle/src/angle.gyp 2015-04-21 22:02:35.668680845 +0300
@@ -104,8 +104,7 @@
{
'action_name': 'Generate ANGLE Commit ID Header',
'message': 'Generating ANGLE Commit ID',
- # reference the git index as an input, so we rebuild on changes to the index
- 'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ],
+ 'inputs': [ '<(angle_id_script)' ],
'outputs': [ '<(angle_id_header)' ],
'msvs_cygwin_shell': 0,
'action':
network/web/chromium-browser/files/pld-linux/chromium-browser-build.patch
-11
View File
@@ -1,11 +0,0 @@
--- chromium-browser-38.0.2125.111/media/cast/logging/encoding_event_subscriber.cc~ 2014-10-02 19:39:47.000000000 +0200
+++ chromium-browser-38.0.2125.111/media/cast/logging/encoding_event_subscriber.cc 2014-11-05 06:35:45.611057986 +0100
@@ -6,6 +6,7 @@
#include <cstring>
#include <utility>
+#include <algorithm>
#include "base/logging.h"
#include "media/cast/logging/proto/proto_utils.h"
network/web/chromium-browser/files/pld-linux/dlopen_sonamed_gl.patch
-17
View File
@@ -1,17 +0,0 @@
dlopen the sonamed libs directly, like it has already been done for libGL.so.1,
as we don't want to Depend on the -devel packages for the .so files:
- libOSMesa.so.8: Mesa-libOSMesa-9.2.0-2
- libGLESv2.so.2: Mesa-libGLES-9.2.0-2
- libEGL.so.1: Mesa-libEGL-9.2.0-2
--- chromium-browser-36.0.1985.143/ui/gl/gl_implementation_osmesa.cc~ 2014-08-12 22:02:27.000000000 +0300
+++ chromium-browser-36.0.1985.143/ui/gl/gl_implementation_osmesa.cc 2014-08-18 23:09:25.208179075 +0300
@@ -37,7 +37,7 @@
return false;
}
- base::FilePath library_path = module_path.Append("libosmesa.so");
+ base::FilePath library_path = module_path.Append("libOSMesa.so.8");
base::NativeLibrary library = LoadLibraryAndPrintError(library_path);
if (!library)
return false;
network/web/chromium-browser/files/pld-linux/ffmpeg-generate-errors.patch
-72
View File
@@ -1,72 +0,0 @@
fix error reporting:
...
File "chromium/scripts/generate_gyp.py", line 757, in GetIncludedSources
exit('Failed to find file', include_file_path)
TypeError: __call__() takes at most 2 arguments (3 given)
--- ./third_party/ffmpeg/chromium/scripts/generate_gyp.py~ 2015-07-27 07:15:51.000000000 +0300
+++ ./third_party/ffmpeg/chromium/scripts/generate_gyp.py 2015-07-27 07:15:55.928135410 +0300
@@ -79,6 +79,7 @@
import string
import subprocess
import shutil
+import sys
COPYRIGHT = """# Copyright %d The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
@@ -149,6 +150,9 @@
# Mac doesn't have any platform specific files, so just use linux and win.
SUPPORTED_PLATFORMS = ['linux', 'win']
+def die(error):
+ print >> sys.stderr, error
+ sys.exit(1)
def NormalizeFilename(name):
""" Removes leading path separators in an attempt to normalize paths."""
@@ -753,7 +757,7 @@
elif include_file_path in IGNORED_INCLUDE_FILES:
continue
else:
- exit('Failed to find file', include_file_path)
+ die('Failed to find file: ' + include_file_path)
# At this point we've found the file. Check if its in our ignore list which
# means that the list should be updated to no longer mention this file.
@@ -772,7 +776,7 @@
licensecheck_path = os.path.abspath(os.path.join(
source_root, 'third_party', 'devscripts', 'licensecheck.pl'));
if not os.path.exists(licensecheck_path):
- exit('Could not find licensecheck.pl: ' + str(licensecheck_path))
+ die('Could not find licensecheck.pl: ' + str(licensecheck_path))
check_process = subprocess.Popen([licensecheck_path,
'-l', '100',
@@ -838,7 +842,7 @@
# Sanity check: source set should not have any renames prior to this step.
if RENAME_PREFIX in basename:
- exit('Found unexpected renamed file in SourceSet: %s' % basename)
+ die('Found unexpected renamed file in SourceSet: %s' % basename)
# Craft a new unique basename from the path of the colliding file
if basename in known_basenames:
@@ -896,7 +900,7 @@
sets = CreatePairwiseDisjointSets(sets)
if not sets:
- exit('ERROR: failed to find any source sets. ' +
+ die('ERROR: failed to find any source sets. ' +
'Are build_dir (%s) and/or source_dir (%s) options correct?' %
(options.build_dir, options.source_dir))
@@ -904,7 +908,7 @@
if not CheckLicensesForStaticLinking(sets, source_dir,
options.print_licenses):
- exit ('GENERATE FAILED: invalid licenses detected.')
+ die('GENERATE FAILED: invalid licenses detected.')
print 'License checks passed.'
# Open for writing.
network/web/chromium-browser/files/pld-linux/ffmpeg-generate.patch
-22
View File
@@ -1,22 +0,0 @@
--- chromium-browser-44.0.2403.107/third_party/ffmpeg/chromium/scripts/generate_gyp.py~ 2015-07-27 07:21:59.000000000 +0300
+++ chromium-browser-44.0.2403.107/third_party/ffmpeg/chromium/scripts/generate_gyp.py 2015-07-27 07:22:03.210572817 +0300
@@ -757,7 +757,8 @@
elif include_file_path in IGNORED_INCLUDE_FILES:
continue
else:
- die('Failed to find file: ' + include_file_path)
+ print('Failed to find file: ' + include_file_path)
+ continue
# At this point we've found the file. Check if its in our ignore list which
# means that the list should be updated to no longer mention this file.
@@ -776,7 +777,8 @@
licensecheck_path = os.path.abspath(os.path.join(
source_root, 'third_party', 'devscripts', 'licensecheck.pl'));
if not os.path.exists(licensecheck_path):
- die('Could not find licensecheck.pl: ' + str(licensecheck_path))
+ print('Could not find licensecheck.pl: ' + str(licensecheck_path))
+ return True
check_process = subprocess.Popen([licensecheck_path,
'-l', '100',
network/web/chromium-browser/files/pld-linux/path-libpdf.patch
-19
View File
@@ -1,19 +0,0 @@
In PLD Linux, browser-plugins framework symlinks enabled plugins to plugins/ dir
access directly from there, instead of symlinking in google-chrome.spec
--- chromium-browser-20.0.1132.57/./src/chrome/common/chrome_paths.cc~ 2012-07-13 21:13:51.000000000 +0300
+++ chromium-browser-20.0.1132.57/./src/chrome/common/chrome_paths.cc 2012-07-13 21:14:41.799431216 +0300
@@ -255,9 +255,11 @@
cur = cur.Append(chrome::kPepperFlashPluginFilename);
break;
case chrome::FILE_PDF_PLUGIN:
- if (!GetInternalPluginsDirectory(&cur))
+ if (!PathService::Get(base::DIR_MODULE, &cur))
return false;
- cur = cur.Append(kInternalPDFPluginFileName);
+
+ cur = cur.Append(FILE_PATH_LITERAL("plugins"))
+ .Append(kInternalPDFPluginFileName);
break;
case chrome::FILE_NACL_PLUGIN:
if (!GetInternalPluginsDirectory(&cur))
network/web/chromium-browser/files/pld-linux/remove_bundled_libraries-stale.patch
-29
View File
@@ -1,29 +0,0 @@
--- chromium-browser-31.0.1650.57/build/linux/unbundle/remove_bundled_libraries.py 2013-11-16 22:18:32.618209221 +0200
+++ chromium-browser-31.0.1650.57/build/linux/unbundle/remove_bundled_libraries.py 2013-11-16 23:34:12.718095629 +0200
@@ -27,6 +27,7 @@
parser = optparse.OptionParser()
parser.add_option('--do-remove', action='store_true')
+ parser.add_option('--do-print', action='store_true')
options, args = parser.parse_args(argv)
@@ -62,6 +63,8 @@
if options.do_remove:
# Delete the file - best way to ensure it's not used during build.
+ if options.do_print:
+ print relpath
os.remove(path)
else:
# By default just print paths that would be removed.
@@ -74,7 +77,7 @@
for exclusion, used in exclusion_used.iteritems():
if not used:
print '%s does not exist' % exclusion
- exit_code = 1
+ exit_code = 0
if not options.do_remove:
print ('To actually remove files printed above, please pass ' +
network/web/chromium-browser/files/pld-linux/system-mesa.patch
-14
View File
@@ -1,14 +0,0 @@
in PLD Linux, windows includes are not packaged
http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2013-February/023459.html
--- chromium-browser-42.0.2311.82/ui/gl/generate_bindings.py~ 2015-04-09 00:14:31.000000000 +0300
+++ chromium-browser-42.0.2311.82/ui/gl/generate_bindings.py 2015-04-19 23:32:27.601618454 +0300
@@ -1616,7 +1616,7 @@
'EGL_ANGLE_surface_d3d_texture_2d_share_handle',
],
],
- [WGL_FUNCTIONS, 'wgl', ['noninclude/GL/wglext.h'], []],
+# [WGL_FUNCTIONS, 'wgl', ['noninclude/GL/wglext.h'], []],
[GLX_FUNCTIONS, 'glx', ['GL/glx.h', 'noninclude/GL/glxext.h'], []],
]
network/web/chromium-browser/files/png.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cppg 2016-05-01 15:22:46.103607522 +0800
+++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp 2016-05-01 15:25:14.459753876 +0800
@@ -234,7 +234,7 @@
#endif
png_uint_32 profileLength = 0;
if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
- setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
+ setColorProfileAndTransform((const char*)profile, profileLength, imageHasAlpha, false /* useSRGB */);
}
}
#endif // PNG_iCCP_SUPPORTED
network/web/chromium-browser/pspec.xml
+15 -34
View File
@@ -5,15 +5,15 @@
<Name>chromium-browser</Name>
<Homepage>http://code.google.com/chromium</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
<Name>Admin PisiLinux</Name>
<Email>admin@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Icon>chromium-browser</Icon>
<Icon>chromium</Icon>
<IsA>app:gui</IsA>
<Summary>A WebKit powered web browser</Summary>
<Description>Chromium-browser is an open-source web browser, powered by WebKit.</Description>
<Archive sha1sum="51cb1e76e5b46c2cb2b04f6f0dbaeb807c53cec0" type="tarxz">http://gsdview.appspot.com/chromium-browser-official/chromium-48.0.2564.97.tar.xz</Archive>
<Archive sha1sum="dfa835efcf3e601f8b88695c562768a7d478b7a8" type="tarxz">http://gsdview.appspot.com/chromium-browser-official/chromium-51.0.2704.84.tar.xz</Archive>
<BuildDependencies>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>at-spi2-atk-devel</Dependency>
@@ -81,26 +81,14 @@
<Dependency>ninja</Dependency>
</BuildDependencies>
<Patches>
<Patch>gentoo/chromium-libsecret-r0.patch</Patch>
<Patch>gentoo/chromium-system-jinja-r7.patch</Patch>
<Patch>opensuse/chromium-gcc-fixes.patch</Patch>
<Patch>opensuse/chromium-master-prefs-path.patch</Patch>
<Patch>opensuse/chromium-more-codec-aliases.patch</Patch>
<Patch>opensuse/no-clang-on-packman.diff</Patch>
<Patch>opensuse/adjust-ldflags-no-keep-memory.patch</Patch>
<Patch>opensuse/chromium-sandbox-pie.patch</Patch>
<Patch>pld-linux/dlopen_sonamed_gl.patch</Patch>
<Patch>pld-linux/remove_bundled_libraries-stale.patch</Patch>
<Patch>pld-linux/chromium-browser-build.patch</Patch>
<Patch>pld-linux/angle.patch</Patch>
<Patch>pld-linux/system-mesa.patch</Patch>
<!--<Patch>pld-linux/ffmpeg-generate-errors.patch</Patch>
<Patch>fedora/webui-error.patch</Patch>-->
<Patch level="1">PNGImageDecoder.patch</Patch>
<Patch level="1">chromium-widevine.patch</Patch>
<Patch level="1">pisilinux/gfx_jpeg_codec.patch</Patch>
<Patch level="1">pisilinux/fix_build_with_newer_gcc.patch</Patch>
</Patches>
</Source>
<Package>
<Name>chromium-browser</Name>
<Name>chromium</Name>
<RuntimeDependencies>
<Dependency>alsa-lib</Dependency>
<Dependency>dbus</Dependency>
@@ -143,7 +131,7 @@
<Dependency>libpng</Dependency>
<Dependency>snappy</Dependency>
<Dependency>freetype</Dependency>
<Dependency>harfbuzz</Dependency>
<Dependency>harfbuzz</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
@@ -163,19 +151,12 @@
</Package>
<History>
<Update release="2">
<Date>2016-06-09</Date>
<Version>48.0.2564.97</Version>
<Comment>Release Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2016-02-14</Date>
<Version>48.0.2564.97</Version>
<Comment>First release</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
<Date>2016-06-12</Date>
<Version>51.0.2704.84</Version>
<Comment>First release.</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
</History>
</PISI>
network/web/chromium-browser/pspec.xml_new
-307
View File
@@ -1,307 +0,0 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>chromium-browser</Name>
<Homepage>http://code.google.com/chromium</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Icon>chromium-browser</Icon>
<IsA>app:gui</IsA>
<Summary>A WebKit powered web browser</Summary>
<Description>Chromium-browser is an open-source web browser, powered by WebKit.</Description>
<Archive sha1sum="9dbfc3520d5fa4133c5cc5093ab10338ef06f773" type="tarxz">http://gsdview.appspot.com/chromium-browser-official/chromium-50.0.2632.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>at-spi2-atk-devel</Dependency>
<Dependency>atk-devel</Dependency>
<Dependency>cairo-devel</Dependency>
<Dependency>cups-devel</Dependency>
<Dependency>desktop-file-utils</Dependency>
<Dependency>faac-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency>
<Dependency>flac-devel</Dependency>
<Dependency>pciutils-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>gperf</Dependency>
<Dependency>jack-audio-connection-kit-devel</Dependency>
<Dependency>libavc1394-devel</Dependency>
<Dependency>libgnome-keyring-devel</Dependency>
<Dependency>speech-dispatcher-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>gsm-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>harfbuzz-devel</Dependency>
<Dependency>hunspell-devel</Dependency>
<Dependency>icu4c-devel</Dependency>
<Dependency>imlib2-devel</Dependency>
<Dependency>lame-devel</Dependency>
<Dependency>libdc1394-devel</Dependency>
<Dependency>libdrm-devel</Dependency>
<Dependency>libevent-devel</Dependency>
<Dependency>libexif-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>libmtp-devel</Dependency>
<Dependency>libogg-devel</Dependency>
<Dependency>libopus-devel</Dependency>
<Dependency>libsecret-devel</Dependency>
<Dependency>libtheora-devel</Dependency>
<Dependency>libvdpau-devel</Dependency>
<Dependency>libvorbis-devel</Dependency>
<Dependency>libvpx-devel</Dependency>
<Dependency>libXcomposite-devel</Dependency>
<Dependency>libXcursor-devel</Dependency>
<Dependency>libXdamage-devel</Dependency>
<Dependency>libXext-devel</Dependency>
<Dependency>libXfixes-devel</Dependency>
<Dependency>libXi-devel</Dependency>
<Dependency>libXrandr-devel</Dependency>
<Dependency>libXrender-devel</Dependency>
<Dependency>libXScrnSaver-devel</Dependency>
<Dependency>libXtst-devel</Dependency>
<Dependency>minizip-devel</Dependency>
<Dependency>mit-kerberos</Dependency>
<Dependency>nss-devel</Dependency>
<Dependency>opencore-amr-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>python-lxml</Dependency>
<Dependency>schroedinger-devel</Dependency>
<Dependency>snappy-devel</Dependency>
<Dependency>speex-devel</Dependency>
<Dependency>valgrind</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>x264-devel</Dependency>
<Dependency>xdg-utils</Dependency>
<Dependency>xvid-devel</Dependency>
<Dependency>ninja</Dependency>
</BuildDependencies>
<Patches>
<Patch>gentoo/chromium-libsecret-r0.patch</Patch>
<Patch>gentoo/chromium-system-jinja-r7.patch</Patch>
<Patch>opensuse/chromium-gcc-fixes.patch</Patch>
<Patch>opensuse/chromium-master-prefs-path.patch</Patch>
<Patch>opensuse/chromium-more-codec-aliases.patch</Patch>
<Patch>opensuse/no-clang-on-packman.diff</Patch>
<Patch>opensuse/adjust-ldflags-no-keep-memory.patch</Patch>
<Patch>opensuse/chromium-sandbox-pie.patch</Patch>
<Patch>pld-linux/dlopen_sonamed_gl.patch</Patch>
<Patch>pld-linux/remove_bundled_libraries-stale.patch</Patch>
<Patch>pld-linux/chromium-browser-build.patch</Patch>
<Patch>pld-linux/angle.patch</Patch>
<Patch>pld-linux/system-mesa.patch</Patch>
<!--<Patch>pld-linux/ffmpeg-generate-errors.patch</Patch>
<Patch>fedora/webui-error.patch</Patch>-->
</Patches>
</Source>
<Package>
<Name>chromium-browser</Name>
<RuntimeDependencies>
<Dependency>alsa-lib</Dependency>
<Dependency>dbus</Dependency>
<Dependency>atk</Dependency>
<Dependency>cairo</Dependency>
<Dependency>cups</Dependency>
<Dependency>flac</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency>gtk2</Dependency>
<Dependency>libevent</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>libopus</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>libXcursor</Dependency>
<Dependency>libXdamage</Dependency>
<Dependency>libXext</Dependency>
<Dependency>libXfixes</Dependency>
<Dependency>libXi</Dependency>
<Dependency>libXrandr</Dependency>
<Dependency>libXrender</Dependency>
<Dependency>libXScrnSaver</Dependency>
<Dependency>libXtst</Dependency>
<Dependency>minizip</Dependency>
<Dependency>mit-kerberos</Dependency>
<Dependency>nss</Dependency>
<Dependency>pango</Dependency>
<Dependency>pepperflash</Dependency> <!-- no remove -->
<Dependency>pulseaudio-libs</Dependency>
<Dependency>speech-dispatcher</Dependency>
<Dependency>speex</Dependency>
<Dependency>webp</Dependency>
<Dependency>pciutils</Dependency>
<Dependency>nspr</Dependency>
<Dependency>zlib</Dependency>
<Dependency>expat</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libpng</Dependency>
<Dependency>snappy</Dependency>
<Dependency>freetype</Dependency>
<Dependency>harfbuzz</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/icons</Path>
<Path fileType="data">/usr/share/pixmaps</Path>
<Path fileType="data">/usr/share/applications</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/lib/chromium-browser/master_preferences" >master_preferences</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/applications/chromium-browser.desktop" >chromium-browser.desktop</AdditionalFile>
<AdditionalFile owner="root" permission="0755" target="/usr/bin/chromium-browser">chromium-browser.sh</AdditionalFile>
</AdditionalFiles>
</Package>
<History>
<Update release="20">
<Date>2016-01-27</Date>
<Version>50.0.2632.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="19">
<Date>2016-01-27</Date>
<Version>46.0.2490.80</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="18">
<Date>2015-10-23</Date>
<Version>46.0.2490.80</Version>
<Comment>This version contains a number of security updates and stability fixes.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="17">
<Date>2015-08-23</Date>
<Version>45.0.2454.85</Version>
<Comment>This version contains a number of security updates and stability fixes.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="16">
<Date>2015-08-03</Date>
<Version>44.0.2403.155</Version>
<Comment>This version contains a number of security updates and stability fixes.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="15">
<Date>2015-06-23</Date>
<Version>43.0.2357.132</Version>
<Comment>This version contains a number of security updates and stability fixes.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="14">
<Date>2015-05-23</Date>
<Version>42.0.2311.135</Version>
<Comment>This version contains a number of security updates and stability fixes.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="13">
<Date>2015-04-23</Date>
<Version>42.0.2311.90</Version>
<Comment>This version contains a number of security updates and stability fixes.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="12">
<Date>2015-02-17</Date>
<Version>40.0.2214.114</Version>
<Comment>This version contains a number of security updates and stability fixes.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="11">
<Date>2015-02-07</Date>
<Version>40.0.2214.94</Version>
<Comment>Version bump.</Comment>
<Name>Vedat Demir</Name>
<Email>vedat@pisilinux.org</Email>
</Update>
<Update release="10">
<Date>2014-04-07</Date>
<Version>33.0.1750.152</Version>
<Comment>Version bump.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="9">
<Date>2014-02-24</Date>
<Version>33.0.1750.117</Version>
<Comment>Version bump, switch bootstrapping NaCl.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2013-11-25</Date>
<Version>33.0.1707.0</Version>
<Comment>Fix dep.</Comment>
<Name>Kamil Atlı</Name>
<Email>suvarice@gmail.com</Email>
</Update>
<Update release="7">
<Date>2013-11-18</Date>
<Version>33.0.1707.0</Version>
<Comment>Fix dep.</Comment>
<Name>Richard de Bruin</Name>
<Email>richdb@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2013-11-13</Date>
<Version>33.0.1707.0</Version>
<Comment>V.Bump</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2013-07-07</Date>
<Version>29.0.1547.0</Version>
<Comment>V.Bump</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2013-03-27</Date>
<Version>27.0.1425.0</Version>
<Comment>V.Bump</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-01-22</Date>
<Version>27.0.1418.2</Version>
<Comment>V.Bump</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-01-22</Date>
<Version>26.0.1390.0</Version>
<Comment>Güncellendi.</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-12-25</Date>
<Version>26.0.1370.0</Version>
<Comment>First release</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
</History>
</PISI>
network/web/chromium-browser/translations.xml
Executable → Regular
-2
View File
@@ -4,7 +4,5 @@
<Name>chromium-browser</Name>
<Summary xml:lang="tr">Webkit tabanlı ağ tarayıcı</Summary>
<Description xml:lang="tr">Chromium, açık kaynak kodlu Webkit tabanlı bir ağ tarayıcıdır.</Description>
<Summary xml:lang="es">Navegador web basado en Webkit</Summary>
<Description xml:lang="es">Chromium, navegador web de código abierto basado en Webkit.</Description>
</Source>
</PISI>
programming/language/lua/actions.py
+4 -4
View File
@@ -12,7 +12,7 @@ from pisi.actionsapi import get
major = ".".join(get.srcVERSION().split(".")[:2])
def setup():
pisitools.dosed("src/Makefile", "^CFLAGS.*$", "CFLAGS=%s -fPIC -DLUA_USE_LINUX" % get.CFLAGS())
pisitools.dosed("src/Makefile", "^CFLAGS.*$", "CFLAGS=%s -fPIC -DLUA_USE_LINUX -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" % get.CFLAGS())
pisitools.dosed("src/Makefile", "^MYLDFLAGS.*$", "MYLDFLAGS=%s" % get.LDFLAGS())
pisitools.dosed("lua.pc", "%VER%", "%s" % major)
pisitools.dosed("lua.pc", "%REL%", "%s" % get.srcVERSION())
@@ -21,14 +21,14 @@ def build():
autotools.make("linux")
def install():
autotools.rawInstall("INSTALL_TOP=%s/usr INSTALL_MAN=%s/usr/share/man/ TO_LIB='liblua.so liblua.so.5.2 liblua.so.5.2.4'" % (get.installDIR(),get.installDIR()))
autotools.rawInstall("INSTALL_TOP=%s/usr INSTALL_MAN=%s/usr/share/man/ TO_LIB='liblua.so liblua.so.5.3 liblua.so.5.3.3'" % (get.installDIR(),get.installDIR()))
pisitools.insinto("/usr/lib/pkgconfig", "lua.pc")
pisitools.insinto("/usr/lib/pkgconfig", "lua.pc", "lua5.2.pc")
pisitools.insinto("/usr/lib/pkgconfig", "lua.pc", "lua5.3.pc")
#free directory
pisitools.removeDir("usr/lib/lua/")
pisitools.removeDir("usr/share/lua/")
pisitools.dohtml("doc")
pisitools.dodoc("README")
pisitools.dodoc("README")
programming/language/lua/files/liblua.so.patch
+26 -23
View File
@@ -1,7 +1,8 @@
diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile
--- lua-5.2.1/Makefile 2012-05-17 16:05:54.000000000 +0200
+++ lua-5.2.1.new/Makefile 2012-09-12 22:39:07.162748096 +0200
@@ -52,7 +52,7 @@
diff --git a/Makefile b/Makefile
index 7fa91c8..dccf485 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ R= $V.0
all: $(PLAT)
$(PLATS) clean:
@@ -10,30 +11,19 @@ diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile
test: dummy
src/lua -v
diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.new/src/luaconf.h
--- lua-5.2.1/src/luaconf.h 2012-05-11 16:14:42.000000000 +0200
+++ lua-5.2.1.new/src/luaconf.h 2012-09-12 22:40:27.986622772 +0200
@@ -100,7 +100,7 @@
#else /* }{ */
#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
-#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT "/usr/"
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
#define LUA_PATH_DEFAULT \
diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile
--- lua-5.2.1/src/Makefile 2012-03-09 17:32:16.000000000 +0100
+++ lua-5.2.1.new/src/Makefile 2012-09-12 22:38:08.591386896 +0200
@@ -29,6 +29,7 @@
PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
diff --git a/src/Makefile b/src/Makefile
index 2e7a412..fa5769f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,6 +29,7 @@ MYOBJS=
PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
LUA_A= liblua.a
+LUA_SO= liblua.so
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
ltm.o lundump.o lvm.o lzio.o
@@ -43,7 +44,7 @@
@@ -43,7 +44,7 @@ LUAC_T= luac
LUAC_O= luac.o
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
@@ -42,7 +32,7 @@ diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile
ALL_A= $(LUA_A)
# Targets start here.
@@ -59,6 +60,12 @@
@@ -59,6 +60,12 @@ $(LUA_A): $(BASE_O)
$(AR) $@ $(BASE_O)
$(RANLIB) $@
@@ -55,3 +45,16 @@ diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile
$(LUA_T): $(LUA_O) $(LUA_A)
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
diff --git a/src/luaconf.h b/src/luaconf.h
index fd28d21..e2662cc 100644
--- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -175,7 +175,7 @@
#else /* }{ */
-#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT "/usr/"
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
#define LUA_PATH_DEFAULT \
programming/language/lua/pspec.xml
+9 -2
View File
@@ -12,9 +12,9 @@
<IsA>library</IsA>
<Summary>A light-weight programming language</Summary>
<Description>lua is a powerful light-weight programming language designed for extending applications.</Description>
<Archive sha1sum="ef15259421197e3d85b7d6e4871b8c26fd82c1cf" type="targz">http://www.lua.org/ftp/lua-5.2.4.tar.gz</Archive>
<Archive sha1sum="a0341bc3d1415b814cc738b2ec01ae56045d64ef" type="targz">http://www.lua.org/ftp/lua-5.3.3.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile target="lua.pc">lua.pc</AdditionalFile>
<AdditionalFile target="lua.pc">lua.pc</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency>readline-devel</Dependency>
@@ -54,6 +54,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-06-14</Date>
<Version>5.3.3</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>5.2.4</Version>