Ticket #35177: mplayer2-vo_corevideo-x11-naming-conflict.2.patch

File mplayer2-vo_corevideo-x11-naming-conflict.2.patch, 1.5 KB (added by neverpanic (Clemens Lang), 12 years ago)

Patch against $(port dir mplayer2)

  • files/patch-libvo-vo_corevideo.m.diff

     
     1--- libvo/vo_corevideo.m.orig   2012-07-20 00:29:48.000000000 +0200
     2+++ libvo/vo_corevideo.m        2012-07-20 00:30:03.000000000 +0200
     3@@ -19,6 +19,8 @@
     4  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     5  */
     6 
     7+#define NO_X11_INCLUDES
     8+
     9 #import "vo_corevideo.h"
     10 
     11 // mplayer includes

  • files/patch-libvo-gl_common.h.diff

     
     1--- libvo/gl_common.h.orig      2012-07-20 20:27:39.000000000 +0200
     2+++ libvo/gl_common.h   2012-07-20 20:28:00.000000000 +0200
     3@@ -38,9 +38,10 @@
     4 #include "w32_common.h"
     5 #endif
     6 #ifdef CONFIG_GL_X11
     7-#include <X11/Xlib.h>
     8 #include <GL/glx.h>
     9+#ifndef NO_X11_INCLUDES
     10 #include "x11_common.h"
     11+#endif
     12 // This old-vo wrapper macro would conflict with the struct member
     13 #undef update_xinerama_info
     14 #endif

  • Portfile

     
    6565
    6666universal_variant       no
    6767
     68patchfiles              patch-libvo-vo_corevideo.m.diff \
     69                        patch-libvo-gl_common.h.diff
     70
    6871configure.cppflags-append \
    6972                        -I$prefix/include/freetype2
    7073