| Message ID | 20220620210856.771825-2-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] package/x11r7/xserver_xorg-server: fix xephyr build with kdrive | expand |
On 20/06/2022 23:08, Fabrice Fontaine wrote: > dmx has been dropped since version 21.1.0 and > https://gitlab.freedesktop.org/xorg/xserver/-/commit/b3b81c8c2090cd49410960a021baf0d27fdd2ab3 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks. Regards, Arnout > --- > package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > index fa5d2a802d..43d2038a8d 100644 > --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > @@ -45,7 +45,6 @@ XSERVER_XORG_SERVER_CONF_OPTS = \ > --disable-config-hal \ > --enable-record \ > --disable-xnest \ > - --disable-dmx \ > --disable-unit-tests \ > --with-builder-addr=buildroot@buildroot.org \ > CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -O2" \ > @@ -165,10 +164,6 @@ else > XSERVER_XORG_SERVER_CONF_OPTS += --disable-screensaver > endif > > -ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) > -XSERVER_XORG_SERVER_CONF_OPTS += --disable-dmx > -endif > - > ifeq ($(BR2_PACKAGE_OPENSSL),y) > XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libcrypto > XSERVER_XORG_SERVER_DEPENDENCIES += openssl
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > dmx has been dropped since version 21.1.0 and > https://gitlab.freedesktop.org/xorg/xserver/-/commit/b3b81c8c2090cd49410960a021baf0d27fdd2ab3 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2022.05.x and 2022.02.x, thanks. Should we then drop the libdmx package?
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index fa5d2a802d..43d2038a8d 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -45,7 +45,6 @@ XSERVER_XORG_SERVER_CONF_OPTS = \ --disable-config-hal \ --enable-record \ --disable-xnest \ - --disable-dmx \ --disable-unit-tests \ --with-builder-addr=buildroot@buildroot.org \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -O2" \ @@ -165,10 +164,6 @@ else XSERVER_XORG_SERVER_CONF_OPTS += --disable-screensaver endif -ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) -XSERVER_XORG_SERVER_CONF_OPTS += --disable-dmx -endif - ifeq ($(BR2_PACKAGE_OPENSSL),y) XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libcrypto XSERVER_XORG_SERVER_DEPENDENCIES += openssl
dmx has been dropped since version 21.1.0 and https://gitlab.freedesktop.org/xorg/xserver/-/commit/b3b81c8c2090cd49410960a021baf0d27fdd2ab3 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 5 ----- 1 file changed, 5 deletions(-)