Update to Enlightenment E16 1.0.22
This commit is contained in:
feinerer
parent
6e7dc5e9e5
commit
7bc7204cbc
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.75 2019/08/10 08:39:48 feinerer Exp $
|
||||
# $OpenBSD: Makefile,v 1.76 2021/01/25 12:32:15 feinerer Exp $
|
||||
|
||||
COMMENT= themed window manager
|
||||
|
||||
V= 1.0.20
|
||||
V= 1.0.22
|
||||
DISTNAME= e16-$V
|
||||
PKGNAME= enlightenment-$V
|
||||
DOCS= e16-docs-0.16.8.0.2
|
||||
@ -17,9 +17,9 @@ PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB = FLAC ICE Imlib2 SM X11 Xcomposite Xdamage Xext Xfixes Xft
|
||||
WANTLIB += Xinerama Xrandr Xrender audiofile c expat ffi fontconfig
|
||||
WANTLIB += freetype fribidi glib-2.0 gobject-2.0 graphite2
|
||||
WANTLIB += gthread-2.0 harfbuzz iconv intl m ogg pango-1.0 pangoft2-1.0
|
||||
WANTLIB += pangoxft-1.0 pcre pthread sndio xcb z
|
||||
WANTLIB += freetype fribidi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
|
||||
WANTLIB += harfbuzz iconv intl m ogg pango-1.0 pangoft2-1.0
|
||||
WANTLIB += pangoxft-1.0 pcre pthread sndio xcb z ${COMPILER_LIBCXX}
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
|
||||
|
||||
@ -27,11 +27,6 @@ DISTFILES= ${DISTNAME}.tar.gz \
|
||||
${DOCS}.tar.gz \
|
||||
${THEMES}.tar.gz
|
||||
|
||||
AUTOCONF_VERSION= 2.69
|
||||
AUTOMAKE_VERSION= 1.15
|
||||
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
|
||||
${MODGNU_AUTOMAKE_DEPENDS}
|
||||
|
||||
LIB_DEPENDS= devel/glib2 \
|
||||
devel/libaudiofile \
|
||||
devel/pango \
|
||||
@ -49,15 +44,6 @@ CONFIGURE_ARGS+= --enable-sound=sndio \
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
|
||||
|
||||
post-extract:
|
||||
cp -f ${FILESDIR}/sound_sndio.c ${WRKSRC}/src
|
||||
|
||||
do-gen:
|
||||
cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} aclocal -I m4
|
||||
cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} autoconf
|
||||
cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} autoheader
|
||||
cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} automake
|
||||
|
||||
post-configure:
|
||||
@cd ${WRKDIR}/${DOCS} && ${SETENV} ${CONFIGURE_ENV} \
|
||||
/bin/sh ./configure ${CONFIGURE_ARGS}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
SHA256 (e16-1.0.20.tar.gz) = lkX5kpSxBnhjzhFoOKZ0gGoXdwY8V3YTVsCDkijK3f8=
|
||||
SHA256 (e16-1.0.22.tar.gz) = sH0wGgpnrAIJdK/L53nh1Is3bqsuR3+xiSd8E7dtSmc=
|
||||
SHA256 (e16-docs-0.16.8.0.2.tar.gz) = uNjgyvRZMc5nL6UIipY2hVM6Zamoz+7hUjnZbzuRWT8=
|
||||
SHA256 (e16-themes-1.0.2.tar.gz) = f/3/XB+koTxwcVNWyVIlZIfQ1k8OpRPnVhHKbmE+coU=
|
||||
SIZE (e16-1.0.20.tar.gz) = 2469250
|
||||
SIZE (e16-1.0.22.tar.gz) = 2476849
|
||||
SIZE (e16-docs-0.16.8.0.2.tar.gz) = 1655229
|
||||
SIZE (e16-themes-1.0.2.tar.gz) = 8220355
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.2 2019/02/24 07:42:16 feinerer Exp $
|
||||
Index: configure.ac
|
||||
--- configure.ac.orig
|
||||
+++ configure.ac
|
||||
@@ -91,12 +91,12 @@ AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_hints_gnom
|
||||
|
||||
AC_ARG_ENABLE(sound,
|
||||
AC_HELP_STRING([--enable-sound],
|
||||
- [compile with sound support (pulseaudio/esound/no)@<:@default=pulseaudio@:>@]),,
|
||||
+ [compile with sound support (pulseaudio/esound/sndio/no)@<:@default=pulseaudio@:>@]),,
|
||||
enable_sound=pulseaudio)
|
||||
case x$enable_sound in
|
||||
xyes)
|
||||
enable_sound=pulseaudio;;
|
||||
-xpulseaudio|xesound)
|
||||
+xpulseaudio|xesound|xsndio)
|
||||
;;
|
||||
*)
|
||||
enable_sound=no;;
|
||||
@@ -137,6 +137,21 @@ if test "x$enable_sound" = "xesound"; then
|
||||
fi
|
||||
fi
|
||||
AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound" = "xesound")
|
||||
+
|
||||
+if test "x$enable_sound" = "xsndio"; then
|
||||
+ AC_CHECK_HEADERS(sndio.h,, enable_sound=no
|
||||
+ AC_MSG_WARN([sndio sound support was requested but not found.]))
|
||||
+ AC_CHECK_LIB(sndio, sio_open, SNDIO_LIBS="-lsndio", enable_sound=no)
|
||||
+ AC_SUBST(SNDIO_LIBS)
|
||||
+ if test "x$enable_sound" = "xsndio"; then
|
||||
+ AC_DEFINE(HAVE_SOUND, 1, [Sound support])
|
||||
+ AC_DEFINE(HAVE_SOUND_SNDIO, 1, [Sndio sound support])
|
||||
+ AC_DEFINE(USE_SOUND_LOADER_AUDIOFILE, 1, [Use audiofile sound loader])
|
||||
+ PKG_CHECK_MODULES(AUDIOFILE, audiofile,,)
|
||||
+ enable_sound=sndio
|
||||
+ fi
|
||||
+fi
|
||||
+AM_CONDITIONAL(USE_LIBSNDIO, test "x$enable_sound" = "xsndio")
|
||||
|
||||
if test "x$enable_sound" != "xno" -a "x$with_sndldr" = "xnone"; then
|
||||
AC_MSG_ERROR([Sound support requires a sound loader])
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-eesh_main_c,v 1.2 2019/08/10 08:39:49 feinerer Exp $
|
||||
|
||||
https://git.enlightenment.org/e16/e16.git/commit/?id=c423cd13f6b7b94588dccfc755055381c9d95928
|
||||
|
||||
--- eesh/main.c.orig Sat Sep 10 12:58:44 2016
|
||||
+++ eesh/main.c Sat Sep 10 12:59:08 2016
|
||||
@@ -21,6 +21,7 @@
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
+#include <sys/select.h>
|
||||
#include "E.h"
|
||||
|
||||
/* Global vars */
|
||||
@ -1,41 +0,0 @@
|
||||
$OpenBSD: patch-src_Makefile_am,v 1.3 2019/08/10 08:39:49 feinerer Exp $
|
||||
Index: src/Makefile.am
|
||||
--- src/Makefile.am.orig
|
||||
+++ src/Makefile.am
|
||||
@@ -172,7 +172,7 @@ MODULE_LIBS = $(DLOPEN_LIBS)
|
||||
|
||||
libe16dir = $(pkglibdir)
|
||||
|
||||
-libe16_LTLIBRARIES = $(LIBSND_ESD) $(LIBSND_PA) $(LIBFNT_IFT) $(LIBFNT_XFT) $(LIBFNT_PANGO)
|
||||
+libe16_LTLIBRARIES = $(LIBSND_ESD) $(LIBSND_PA) $(LIBSND_SNDIO) $(LIBFNT_IFT) $(LIBFNT_XFT) $(LIBFNT_PANGO)
|
||||
|
||||
if USE_LIBESD
|
||||
LIBSND_ESD = libsound_esd.la
|
||||
@@ -190,6 +190,14 @@ libsound_pa_la_LIBADD = $(PA_LIBS) $(SNDLDR_LIBS)
|
||||
libsound_pa_la_LDFLAGS = -module -avoid-version
|
||||
endif
|
||||
|
||||
+if USE_LIBSNDIO
|
||||
+LIBSND_SNDIO = libsound_sndio.la
|
||||
+libsound_sndio_la_SOURCES = sound_sndio.c sound_load.c
|
||||
+libsound_sndio_la_CFLAGS = $(SNDIO_CFLAGS) $(AUDIOFILE_CFLAGS) $(CWARNFLAGS)
|
||||
+libsound_sndio_la_LIBADD = $(SNDIO_LIBS) $(AUDIOFILE_LIBS)
|
||||
+libsound_sndio_la_LDFLAGS = -module -avoid-version
|
||||
+endif
|
||||
+
|
||||
LIBFNT_IFT = libfont_ift.la
|
||||
libfont_ift_la_SOURCES = ttfont.c
|
||||
libfont_ift_la_CFLAGS = $(IMLIB2_CFLAGS)
|
||||
@@ -214,9 +222,9 @@ endif
|
||||
|
||||
else
|
||||
|
||||
-MODULE_SRCS = sound_esd.c sound_pa.c sound_load.c ttfont.c text_xft.c text_pango.c
|
||||
-MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(SNDLDR_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
|
||||
-MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(SNDLDR_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
|
||||
+MODULE_SRCS = sound_esd.c sound_pa.c sound_sndio.c sound_load.c ttfont.c text_xft.c text_pango.c
|
||||
+MODULE_LIBS = $(ESD_LIBS) $(PA_LIBS) $(SNDIO_LIBS) $(SNDLDR_LIBS) $(PANGO_LIBS) $(XFT_LIBS)
|
||||
+MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(SNDIO_CFLAGS) $(SNDLDR_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
|
||||
|
||||
endif
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-src_sound_c,v 1.2 2019/02/24 07:42:16 feinerer Exp $
|
||||
Index: src/sound.c
|
||||
--- src/sound.c.orig
|
||||
+++ src/sound.c
|
||||
@@ -34,6 +34,8 @@
|
||||
#define SOUND_SERVER_NAME "esd"
|
||||
#elif HAVE_SOUND_PA
|
||||
#define SOUND_SERVER_NAME "pulseaudio"
|
||||
+#elif HAVE_SOUND_SNDIO
|
||||
+#define SOUND_SERVER_NAME "sndio"
|
||||
#else
|
||||
#error Invalid sound configuration
|
||||
#endif
|
||||
@@ -73,6 +75,9 @@ static const SoundOps *ops = &SoundOps_esd;
|
||||
#elif HAVE_SOUND_PA
|
||||
extern const SoundOps SoundOps_pa;
|
||||
static const SoundOps *ops = &SoundOps_pa;
|
||||
+#elif HAVE_SOUND_SNDIO
|
||||
+extern const SoundOps SoundOps_sndio;
|
||||
+static const SoundOps *ops = &SoundOps_sndio;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user