diff --git a/libvdpau-always-workaround-libflash.patch b/libvdpau-always-workaround-libflash.patch deleted file mode 100644 index ee5d47a..0000000 --- a/libvdpau-always-workaround-libflash.patch +++ /dev/null @@ -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) diff --git a/libvdpau.changes b/libvdpau.changes index 4dd16f6..19d2eb8 100644 --- a/libvdpau.changes +++ b/libvdpau.changes @@ -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 diff --git a/libvdpau.spec b/libvdpau.spec index 6aafc7e..1c2d796 100644 --- a/libvdpau.spec +++ b/libvdpau.spec @@ -30,7 +30,6 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc Patch: vdpauinfo-missing-lX11.diff Patch1: libvdpau-nopdftex.patch -Patch2: libvdpau-always-workaround-libflash.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: doxygen @@ -89,7 +88,6 @@ Its usage is documented in the README. pushd ../vdpauinfo-* %patch -p0 popd -%patch2 -p1 %build autoreconf -fi