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

Merge pull request #2065 from poyraz76/master

Browse Source 
chromium-browser and virtualbox
This commit is contained in:
Ertuğrul Erata
2016-07-23 11:38:33 +03:00
committed by GitHub
parent d010d777b0 9990f0786d
commit 578be951cd
7 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/virtualbox/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>A powerful virtualization program</Summary>
<Description>VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things.</Description>
<Archive sha1sum="6cbce8f912dfbf215ebe1f7875694608a7a666c4" type="tarbz2">http://download.virtualbox.org/virtualbox/5.1.0/VirtualBox-5.1.0.tar.bz2</Archive>
<Archive sha1sum="dba4db3933b9fc8d5632a8c86bd6a7747d891ed9" type="tarbz2">http://download.virtualbox.org/virtualbox/5.1.2/VirtualBox-5.1.2.tar.bz2</Archive>
<BuildDependencies>
<Dependency>dev86</Dependency>
<Dependency>cdrkit</Dependency>
@@ -147,6 +147,13 @@
</Package>
<History>
<Update release="5">
<Date>2016-07-22</Date>
<Version>5.1.2</Version>
<Comment>Version Bump</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2016-07-17</Date>
<Version>5.1.0</Version>
network/plugin/pepperflash/actions.py
+7 -2
View File
@@ -5,7 +5,12 @@
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
WorkDir = "."
def install():
pisitools.insinto("usr/lib/chromium-browser/PepperFlash/", "manifest.json")
pisitools.insinto("usr/lib/chromium-browser/PepperFlash/", "libpepflashplayer.so")
pisitools.insinto("usr/lib/chromium-browser/PepperFlash/", "./PepperFlash/manifest.json")
pisitools.insinto("usr/lib/chromium-browser/PepperFlash/", "./PepperFlash/libpepflashplayer.so")
pisitools.insinto("usr/lib/chromium-browser/", "./chromium-browser/libwidevinecdmadapter.so")
pisitools.insinto("usr/lib/chromium-browser/", "./chromium-browser/libwidevinecdm.so")
network/plugin/pepperflash/pspec.xml
+9 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Google Chrome's Pepper Flash plugin for Chromium.</Summary>
<Description>Google Chrome's Pepper Flash plugin for Chromium (stable version)</Description>
<Archive sha1sum="e66d02a3c265c8741c70bc209c3755481f0d1b98" type="targz">https://dl.dropboxusercontent.com/s/o5xtb8my3cswzwv/pepperflash-22.0.0.192.tar.gz</Archive>
<Archive sha1sum="6ab01b5c3330afb8b3eb8a3d4b7522cdde939e73" type="targz">https://sourceforge.net/projects/pisi-source/files/pepperflash-22.0.0.209.tar.gz</Archive>
</Source>
<Package>
@@ -22,6 +22,7 @@
</RuntimeDependencies>
<Files>
<Path fileType="data">/etc/chromium-browser</Path>
<Path fileType="library">/usr/lib/chromium-browser/</Path>
<Path fileType="library">/usr/lib/chromium-browser/PepperFlash</Path>
</Files>
<AdditionalFiles>
@@ -31,6 +32,13 @@
<History>
<Update release="4">
<Date>2016-07-22</Date>
<Version>22.0.0.209</Version>
<Comment>Version Bump</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-06-30</Date>
<Version>22.0.0.192</Version>
network/web/chromium-browser/actions.py
-2
View File
@@ -100,8 +100,6 @@ def install():
pisitools.insinto("/usr/lib/chromium-browser", "chromedriver")
pisitools.insinto("/usr/lib/chromium-browser", "natives_blob.bin")
pisitools.insinto("/usr/lib/chromium-browser", "snapshot_blob.bin")
pisitools.insinto("/usr/lib/chromium-browser", "libwidevinecdm.so")
pisitools.insinto("/usr/lib/chromium-browser", "libwidevinecdmadapter.so")
pisitools.insinto("/usr/lib/chromium-browser", "character_data_generator")
pisitools.insinto("/usr/lib/chromium-browser", "chrome_sandbox", "chrome-sandbox")
network/web/chromium-browser/files/chromium-browser.desktop
+1 -1
View File
@@ -103,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=22.0.0.192
Exec=chromium-browser %U --ppapi-flash-path=/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so --ppapi-flash-version=$version
Terminal=false
Icon=chromium-browser
Type=Application
network/web/chromium-browser/files/chromium-widevine.patch
-43
View File
@@ -1,46 +1,3 @@
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
network/web/chromium-browser/pspec.xml
+9 -2
View File
@@ -13,7 +13,7 @@
<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="5212b0f96be80c0146f7caf0883cfb39a3827177" type="tarxz">http://gsdview.appspot.com/chromium-browser-official/chromium-51.0.2704.106.tar.xz</Archive>
<Archive sha1sum="427ae146c164f5c6289958476194696de36173ac" type="tarxz">http://gsdview.appspot.com/chromium-browser-official/chromium-52.0.2743.82.tar.xz</Archive>
<BuildDependencies>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>at-spi2-atk-devel</Dependency>
@@ -87,7 +87,7 @@
<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>
<Patch level="1">pisilinux/fix_build_with_newer_gcc.patch</Patch>
</Patches>
</Source>
<Package>
@@ -153,6 +153,13 @@
</Package>
<History>
<Update release="4">
<Date>2016-07-22</Date>
<Version>52.0.2743.82</Version>
<Comment>Version Bump.</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-07-05</Date>
<Version>51.0.2704.106</Version>