diff options
| -rwxr-xr-x | .SRCINFO | 8 | ||||
| -rwxr-xr-x | PKGBUILD | 13 | ||||
| -rw-r--r-- | autoreload.patch | 95 | ||||
| -rwxr-xr-x | transparentpainting.patch | 12 |
4 files changed, 5 insertions, 123 deletions
@@ -1,7 +1,7 @@ pkgbase = obs-linuxbrowser pkgdesc = Browser source plugin for obs-studio based on CEF. Alternative to obs-qtwebkit. - pkgver = 0.3.0 - pkgrel = 4 + pkgver = 0.3.1 + pkgrel = 1 url = https://github.com/bazukas/obs-linuxbrowser arch = i686 arch = x86_64 @@ -12,11 +12,7 @@ pkgbase = obs-linuxbrowser depends = cef-minimal optdepends = pepper-flash: Flash support source = obs-linuxbrowser::git+https://github.com/bazukas/obs-linuxbrowser.git - source = transparentpainting.patch - source = autoreload.patch sha256sums = SKIP - sha256sums = 76733b17029ab1e5873c02754751b666cc4e10d6ff771f6eb8ea3d321a6d2246 - sha256sums = f2b01597083c7af97c56fd68d0d6211448481891ea5e2f3352dabb69bfeb20a6 pkgname = obs-linuxbrowser @@ -1,7 +1,7 @@ # Maintainer: NexAdn pkgname=obs-linuxbrowser -pkgver=0.3.0 -pkgrel=4 +pkgver=0.3.1 +pkgrel=1 pkgdesc="Browser source plugin for obs-studio based on CEF. Alternative to obs-qtwebkit." arch=("i686" "x86_64") url="https://github.com/bazukas/obs-linuxbrowser" @@ -13,19 +13,12 @@ makedepends=("make" "cmake") optdepends=("pepper-flash: Flash support") source=( "${pkgname}::git+https://github.com/bazukas/${pkgname}.git" - "transparentpainting.patch" - "autoreload.patch" ) -sha256sums=('SKIP' - '76733b17029ab1e5873c02754751b666cc4e10d6ff771f6eb8ea3d321a6d2246' - 'f2b01597083c7af97c56fd68d0d6211448481891ea5e2f3352dabb69bfeb20a6') +sha256sums=('SKIP') prepare() { cd "$srcdir"/"${pkgname}" git checkout ${pkgver} - patch -p1 < $srcdir/transparentpainting.patch - patch -p1 < "${srcdir}"/autoreload.patch } - build() { cd "${srcdir}"/${pkgname} mkdir -p ./build diff --git a/autoreload.patch b/autoreload.patch deleted file mode 100644 index de2ffd366028..000000000000 --- a/autoreload.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 64be2db10c330e442272db5c661cb39c3e6340ef Mon Sep 17 00:00:00 2001 -From: NexAdn <nexadn@yandex.com> -Date: Wed, 29 Nov 2017 16:29:47 +0100 -Subject: [PATCH] Implement automatic reload on source activation. (#40) - ---- - data/locale/de-DE.ini | 6 ++++++ - data/locale/en-US.ini | 1 + - src/plugin/main.c | 11 +++++++++++ - 3 files changed, 18 insertions(+) - -diff --git a/data/locale/de-DE.ini b/data/locale/de-DE.ini -index a2d8649..cedbf7f 100644 ---- a/data/locale/de-DE.ini -+++ b/data/locale/de-DE.ini -@@ -5,7 +5,13 @@ Width="Breite" - Height="Höhe" - FPS="FPS" - ReloadPage="Seite Neuladen" -+ReloadOnScene="Bei Aktivierung neuladen" - FlashPath="Flash Plugin Pfad" - FlashVersion="Flash Plugin Version" - RestartBrowser="Browser Neustarten" - CustomCSS="Eigenes CSS" -+CommandLineArguments="Kommandozeilen-Argumente" -+HideScrollbars="Scrolleisten verstecken" -+Zoom="Zoom" -+ScrollVertical="Vertikal scrollen" -+ScrollHorizontal="Horizontal scrollen" -\ No newline at end of file -diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini -index 0ac91db..ee7edd3 100644 ---- a/data/locale/en-US.ini -+++ b/data/locale/en-US.ini -@@ -5,6 +5,7 @@ Width="Width" - Height="Height" - FPS="FPS" - ReloadPage="Reload Page" -+ReloadOnScene="Reload on activate" - FlashPath="Flash Plugin Path" - FlashVersion="Flash Plugin Version" - RestartBrowser="Restart Browser" -diff --git a/src/plugin/main.c b/src/plugin/main.c -index 56a398e..1e6ef9a 100644 ---- a/src/plugin/main.c -+++ b/src/plugin/main.c -@@ -34,6 +34,7 @@ struct browser_data { - uint32_t zoom; - uint32_t scroll_vertical; - uint32_t scroll_horizontal; -+ bool reload_on_scene; - - /* internal data */ - obs_source_t *source; -@@ -66,6 +67,7 @@ static void browser_update(void *vptr, obs_data_t *settings) - uint32_t zoom = obs_data_get_int(settings, "zoom"); - uint32_t scroll_vertical = obs_data_get_int(settings, "scroll_vertical"); - uint32_t scroll_horizontal = obs_data_get_int(settings, "scroll_horizontal"); -+ data->reload_on_scene = obs_data_get_bool(settings, "reload_on_scene"); - - bool is_local = obs_data_get_bool(settings, "is_local_file"); - const char *url; -@@ -200,6 +202,13 @@ static bool reload_button_clicked(obs_properties_t *props, obs_property_t *prope - return true; - } - -+static void reload_on_scene(void* vptr) -+{ -+ struct browser_data* data = vptr; -+ if (data->reload_on_scene) -+ browser_manager_reload_page(data->manager); -+} -+ - static bool restart_button_clicked(obs_properties_t *props, obs_property_t *property, void *vptr) - { - UNUSED_PARAMETER(props); -@@ -251,6 +260,7 @@ static obs_properties_t *browser_get_properties(void *vptr) - 0, 10000000, 1); - - obs_properties_add_button(props, "reload", obs_module_text("ReloadPage"), reload_button_clicked); -+ obs_properties_add_bool(props, "reload_on_scene", obs_module_text("ReloadOnScene")); - - obs_properties_add_path(props, "css_file", obs_module_text("CustomCSS"), - OBS_PATH_FILE, "*.css", NULL); -@@ -376,6 +386,7 @@ bool obs_module_load(void) - info.video_tick = browser_tick; - info.video_render = browser_render; - -+ info.activate = reload_on_scene; - info.mouse_click = browser_mouse_click; - info.mouse_move = browser_mouse_move; - info.mouse_wheel = browser_mouse_wheel; --- -libgit2 0.26.0 - diff --git a/transparentpainting.patch b/transparentpainting.patch deleted file mode 100755 index ddfd7486aed1..000000000000 --- a/transparentpainting.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/browser/browser-app.cpp b/src/browser/browser-app.cpp -index 967b55b..6bedadb 100644 ---- a/src/browser/browser-app.cpp -+++ b/src/browser/browser-app.cpp -@@ -246,7 +246,6 @@ void BrowserApp::OnContextInitialized() - return; - - CefWindowInfo info; -- info.transparent_painting_enabled = true; - info.width = width; - info.height = height; - info.windowless_rendering_enabled = true; |