Merge pull request conan-io#213 from borune-k12/x11

build x11 shared libs
artem-kamyshev · May 21, 2020 · abadeef · abadeef
2 parents 83fa896 + 922037d
commit abadeef
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 2 deletions.
diff --git a/recipes/x11/all/manage.py b/recipes/x11/all/manage.py
@@ -105,7 +105,8 @@ def gen(args):
                 patch_file = os.path.join(current_dir, "patches", patch)
                 if os.path.exists(patch_file):
                     patches_dir = os.path.join(package_dir, "patches")
-                    os.makedirs(patches_dir)
+                    if not os.path.exists(patches_dir):
+                        os.makedirs(patches_dir)
                     copy(patch_file, patches_dir)
 
 

diff --git a/recipes/x11/all/patches/xcb-util-image.patch b/recipes/x11/all/patches/xcb-util-image.patch
@@ -0,0 +1,53 @@
+--- xcb-util-image-0.4.0-origin/test/Makefile.am	2014-06-11 10:49:48.000000000 +0200
++++ xcb-util-image-0.4.0/test/Makefile.am	2020-04-13 18:30:07.304634059 +0200
+@@ -10,11 +10,11 @@
+
+ test_swap_SOURCES = test_swap.c
+ test_swap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) -I$(top_srcdir)/image
+-test_swap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
++test_swap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_SHM_LIBS) $(top_builddir)/image/libxcb-image.la
+
+ test_xcb_image_SOURCES = test_xcb_image.c
+ test_xcb_image_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) -I$(top_srcdir)/image
+-test_xcb_image_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
++test_xcb_image_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_SHM_LIBS) $(top_builddir)/image/libxcb-image.la
+
+ test_xcb_image_shm_SOURCES = test_xcb_image_shm.c
+ test_xcb_image_shm_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) -I$(top_srcdir)/image
+@@ -22,8 +22,8 @@
+
+ test_formats_SOURCES = test_formats.c
+ test_formats_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) $(XPROTO_CFLAGS) -I$(top_srcdir)/image
+-test_formats_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
++test_formats_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_SHM_LIBS) $(top_builddir)/image/libxcb-image.la
+
+ test_bitmap_SOURCES = test_bitmap.c test.xbm
+ test_bitmap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS)  -I$(top_srcdir)/image
+-test_bitmap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
++test_bitmap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_SHM_LIBS) $(top_builddir)/image/libxcb-image.la
+--- xcb-util-image-0.4.0-origin/test/Makefile.in	2014-10-15 04:01:17.000000000 +0200
++++ xcb-util-image-0.4.0/test/Makefile.in	2020-04-13 18:27:34.116156995 +0200
+@@ -548,19 +548,19 @@
+ xcbincludedir = @xcbincludedir@
+ test_swap_SOURCES = test_swap.c
+ test_swap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) -I$(top_srcdir)/image
+-test_swap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
++test_swap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_SHM_LIBS) $(top_builddir)/image/libxcb-image.la
+ test_xcb_image_SOURCES = test_xcb_image.c
+ test_xcb_image_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) -I$(top_srcdir)/image
+-test_xcb_image_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
++test_xcb_image_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_SHM_LIBS) $(top_builddir)/image/libxcb-image.la
+ test_xcb_image_shm_SOURCES = test_xcb_image_shm.c
+ test_xcb_image_shm_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) -I$(top_srcdir)/image
+ test_xcb_image_shm_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_SHM_LIBS) $(top_builddir)/image/libxcb-image.la
+ test_formats_SOURCES = test_formats.c
+ test_formats_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS) $(XPROTO_CFLAGS) -I$(top_srcdir)/image
+-test_formats_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
++test_formats_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_SHM_LIBS) $(top_builddir)/image/libxcb-image.la
+ test_bitmap_SOURCES = test_bitmap.c test.xbm
+ test_bitmap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_UTIL_CFLAGS)  -I$(top_srcdir)/image
+-test_bitmap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(top_builddir)/image/libxcb-image.la
++test_bitmap_LDADD = $(XCB_LIBS) $(XCB_UTIL_LIBS) $(XCB_SHM_LIBS) $(top_builddir)/image/libxcb-image.la
+ all: all-am
+
+ .SUFFIXES:
diff --git a/recipes/x11/all/x11.json b/recipes/x11/all/x11.json
@@ -124,7 +124,7 @@
         "namespace": "xcb",
         "requires": ["xcb-util"],
         "libs": ["xcb-image"],
-        "patches": ["clang.patch"]
+        "patches": ["clang.patch", "xcb-util-image.patch"]
     },
     {
         "name": "xcb-util-keysyms",