Accepting request 160946 from X11:Drivers:Video
- Drop libvdpau-alway-workaround-libflash.patch: while this fixes flash plugin, it breaks all the other apps. (bnc#811360) (forwarded request 160935 from namtrac) OBS-URL: https://build.opensuse.org/request/show/160946 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvdpau?expand=0&rev=22
This commit is contained in:
parent
0dfffa6b4b
commit
41ef68b103
@ -1,39 +0,0 @@
|
|||||||
Index: libvdpau-0.5/src/vdpau_wrapper.c
|
|
||||||
===================================================================
|
|
||||||
--- libvdpau-0.5.orig/src/vdpau_wrapper.c
|
|
||||||
+++ libvdpau-0.5/src/vdpau_wrapper.c
|
|
||||||
@@ -296,33 +296,7 @@ static VdpStatus vdp_wrapper_get_proc_ad
|
|
||||||
|
|
||||||
static void init_running_under_flash(void)
|
|
||||||
{
|
|
||||||
- FILE *fp;
|
|
||||||
- char buffer[1024];
|
|
||||||
- int ret, i;
|
|
||||||
-
|
|
||||||
- fp = fopen("/proc/self/cmdline", "r");
|
|
||||||
- if (!fp) {
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
- ret = fread(buffer, 1, sizeof(buffer) - 1, fp);
|
|
||||||
- fclose(fp);
|
|
||||||
- if (ret < 0) {
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
- /*
|
|
||||||
- * Sometimes the file contains null between arguments. Wipe these out so
|
|
||||||
- * strstr doesn't stop early.
|
|
||||||
- */
|
|
||||||
- for (i = 0; i < ret; i++) {
|
|
||||||
- if (buffer[i] == '\0') {
|
|
||||||
- buffer[i] = 'x';
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- buffer[ret] = '\0';
|
|
||||||
-
|
|
||||||
- if (strstr(buffer, "libflashplayer") != NULL) {
|
|
||||||
- _running_under_flash = 1;
|
|
||||||
- }
|
|
||||||
+ _running_under_flash = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void init_config(void)
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 25 12:12:33 UTC 2013 - idonmez@suse.com
|
||||||
|
|
||||||
|
- Drop libvdpau-alway-workaround-libflash.patch: while this
|
||||||
|
fixes flash plugin, it breaks all the other apps. (bnc#811360)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Feb 3 15:08:19 UTC 2013 - hrvoje.senjan@gmail.com
|
Sun Feb 3 15:08:19 UTC 2013 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
@ -30,7 +30,6 @@ Source99: baselibs.conf
|
|||||||
Source100: %{name}-rpmlintrc
|
Source100: %{name}-rpmlintrc
|
||||||
Patch: vdpauinfo-missing-lX11.diff
|
Patch: vdpauinfo-missing-lX11.diff
|
||||||
Patch1: libvdpau-nopdftex.patch
|
Patch1: libvdpau-nopdftex.patch
|
||||||
Patch2: libvdpau-always-workaround-libflash.patch
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -89,7 +88,6 @@ Its usage is documented in the README.
|
|||||||
pushd ../vdpauinfo-*
|
pushd ../vdpauinfo-*
|
||||||
%patch -p0
|
%patch -p0
|
||||||
popd
|
popd
|
||||||
%patch2 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
|
Loading…
Reference in New Issue
Block a user