Hi,
Noticed that old e16 window manager is lagging behind on releases.
So heres update for it to bring it up-to-date.
I'm not e16 user but it compiles/runs and sound works on amd64.
Timo
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/enlightenment/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile 21 Nov 2017 00:13:04 -0000 1.71
+++ Makefile 12 May 2018 04:54:16 -0000
@@ -2,12 +2,11 @@
COMMENT= themed window manager
-V= 1.0.9
+V= 1.0.18
DISTNAME= e16-$V
PKGNAME= enlightenment-$V
DOCS= e16-docs-0.16.8.0.2
THEMES= e16-themes-1.0.1
-REVISION= 9
CATEGORIES= x11
@@ -18,7 +17,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB = FLAC ICE Imlib2 SM X11 Xcomposite Xdamage Xext Xfixes Xft
WANTLIB += Xinerama Xrandr Xrender audiofile c expat ffi fontconfig
-WANTLIB += freetype glib-2.0 gmodule-2.0 gobject-2.0 graphite2
+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
@@ -33,7 +32,8 @@ AUTOMAKE_VERSION= 1.11
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
-LIB_DEPENDS= devel/glib2 \
+LIB_DEPENDS= devel/fribidi \
+ devel/glib2 \
devel/libaudiofile \
devel/pango \
graphics/imlib2
@@ -45,7 +45,9 @@ SEPARATE_BUILD= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --disable-sound_esound
+CONFIGURE_ARGS+= --enable-sound=sndio \
+ --with-sndldr=audiofile
+
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/enlightenment/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 4 Nov 2014 08:35:57 -0000 1.10
+++ distinfo 12 May 2018 04:54:16 -0000
@@ -1,6 +1,6 @@
-SHA256 (e16-1.0.9.tar.gz) = 1DWECkpCnLIvJB14iegoJwYfbvXM2bvIcgr1He4FPSc=
+SHA256 (e16-1.0.18.tar.gz) = iIiOc48a2jvloaKNIpEGjnC19XSQwvih8oWvtxK8hcI=
SHA256 (e16-docs-0.16.8.0.2.tar.gz) =
uNjgyvRZMc5nL6UIipY2hVM6Zamoz+7hUjnZbzuRWT8=
SHA256 (e16-themes-1.0.1.tar.gz) = M85IxdVlGuOl1WdD9od1zLdj661wMG669+FiWHlAyGU=
-SIZE (e16-1.0.9.tar.gz) = 2256543
+SIZE (e16-1.0.18.tar.gz) = 2441111
SIZE (e16-docs-0.16.8.0.2.tar.gz) = 1655229
SIZE (e16-themes-1.0.1.tar.gz) = 8249438
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/x11/enlightenment/patches/patch-configure_ac,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_ac
--- patches/patch-configure_ac 4 Nov 2014 08:35:57 -0000 1.1
+++ patches/patch-configure_ac 12 May 2018 04:54:16 -0000
@@ -1,35 +1,42 @@
$OpenBSD: patch-configure_ac,v 1.1 2014/11/04 08:35:57 armani Exp $
---- configure.ac.orig Sun Jul 31 13:33:50 2011
-+++ configure.ac Thu Nov 15 21:38:44 2012
-@@ -93,6 +93,10 @@ if test "x$enable_sound" = "xyes"; then
- AC_ARG_ENABLE(sound_esound,
- [ --enable-sound-esound compile with EsounD sound support
@<:@default=yes@:>@],,
- enable_sound_esound=yes)
-+ AC_ARG_ENABLE(sound_sndio,
-+ [ --enable-sound-sndio compile with sndio sound support
@<:@default=yes@:>@],,
-+ enable_sound_sndio=yes)
-+
- fi
- enable_sound=no
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -91,12 +91,12 @@ AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_hints_gnom
-@@ -124,6 +128,20 @@ if test "x$enable_sound_esound" = "xyes"; then
- enable_sound=esound
+ 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,22 @@ if test "x$enable_sound" = "xesound"; then
+ fi
fi
- AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound_esound" = "xyes")
+ AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound" = "xesound")
+
-+if test "x$enable_sound_sndio" = "xyes"; then
-+ AC_CHECK_HEADERS(sndio.h,, enable_sound_sndio=no)
-+ AC_CHECK_LIB(sndio, sio_open, SNDIO_LIBS="-lsndio", enable_sound_sndio=no)
++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)
+fi
-+if test "x$enable_sound_sndio" = "xyes"; then
++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
-+AM_CONDITIONAL(USE_LIBSNDIO, test "x$enable_sound_sndio" = "xyes")
++fi
++AM_CONDITIONAL(USE_LIBSNDIO, test "x$enable_sound" = "xsndio")
# Save CPPFLAGS/LDFLAGS and add X_... to each
SAVE_CPPFLAGS="$CPPFLAGS"
Index: patches/patch-eesh_main_c
===================================================================
RCS file: /cvs/ports/x11/enlightenment/patches/patch-eesh_main_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-eesh_main_c
--- patches/patch-eesh_main_c 10 Sep 2016 13:03:44 -0000 1.1
+++ patches/patch-eesh_main_c 12 May 2018 04:54:16 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-eesh_main_c,v 1.1 2016/09/10 13:03:44 ajacoutot Exp $
---- eesh/main.c.orig Sat Sep 10 12:58:44 2016
-+++ eesh/main.c Sat Sep 10 12:59:08 2016
+Index: eesh/main.c
+--- eesh/main.c.orig
++++ eesh/main.c
@@ -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.
Index: patches/patch-m4_ac_attribute_m4
===================================================================
RCS file: patches/patch-m4_ac_attribute_m4
diff -N patches/patch-m4_ac_attribute_m4
--- patches/patch-m4_ac_attribute_m4 28 Sep 2017 15:08:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-m4_ac_attribute_m4,v 1.1 2017/09/28 15:08:54 dcoppa Exp $
-
-Index: m4/ac_attribute.m4
---- m4/ac_attribute.m4.orig
-+++ m4/ac_attribute.m4
-@@ -16,8 +16,9 @@ AC_DEFUN([AC_C___ATTRIBUTE__],
- [
- AC_MSG_CHECKING(for __attribute__)
- AC_CACHE_VAL(ac_cv___attribute__, [
-- AC_TRY_COMPILE([#include <stdlib.h>],
-- [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
-+ AC_TRY_COMPILE([#include <stdlib.h>
-+ int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
-+ [],
- ac_cv___attribute__=yes, ac_cv___attribute__=no)])
- if test "$ac_cv___attribute__" = "yes"; then
- AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has
__attribute__])
Index: patches/patch-src_Makefile_am
===================================================================
RCS file: /cvs/ports/x11/enlightenment/patches/patch-src_Makefile_am,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_Makefile_am
--- patches/patch-src_Makefile_am 4 Nov 2014 08:35:57 -0000 1.1
+++ patches/patch-src_Makefile_am 12 May 2018 04:54:16 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_Makefile_am,v 1.1 2014/11/04 08:35:57 armani Exp $
---- src/Makefile.am.orig Sun Jul 31 10:02:54 2011
-+++ src/Makefile.am Thu Nov 15 21:58:47 2012
-@@ -161,7 +161,7 @@ MODULE_LIBS = $(DLOPEN_LIBS)
+Index: src/Makefile.am
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -167,7 +167,7 @@ MODULE_LIBS = $(DLOPEN_LIBS)
libe16dir = $(pkglibdir)
@@ -10,7 +11,7 @@ $OpenBSD: patch-src_Makefile_am,v 1.1 20
if USE_LIBESD
LIBSND_ESD = libsound_esd.la
-@@ -179,6 +179,14 @@ libsound_pa_la_LIBADD = $(PA_LIBS) $(AUDIOFILE_LIBS
+@@ -185,6 +185,14 @@ libsound_pa_la_LIBADD = $(PA_LIBS) $(SNDLDR_LIBS)
libsound_pa_la_LDFLAGS = -module -avoid-version
endif
@@ -24,17 +25,17 @@ $OpenBSD: patch-src_Makefile_am,v 1.1 20
+
LIBFNT_IFT = libfont_ift.la
libfont_ift_la_SOURCES = ttfont.c
- libfont_ift_la_CFLAGS = $(IMLIB2_CFLAGS) $(CWARNFLAGS)
-@@ -203,9 +211,9 @@ endif
+ libfont_ift_la_CFLAGS = $(IMLIB2_CFLAGS)
+@@ -209,9 +217,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) $(AUDIOFILE_LIBS) $(PANGO_LIBS)
$(XFT_LIBS)
--MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(AUDIOFILE_CFLAGS)
$(PANGO_CFLAGS) $(XFT_CFLAGS)
+-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) $(AUDIOFILE_LIBS)
$(PANGO_LIBS) $(XFT_LIBS)
-+MODULE_CFLAGS = $(ESD_CFLAGS) $(PA_CFLAGS) $(SNDIO_CFLAGS)
$(AUDIOFILE_CFLAGS) $(PANGO_CFLAGS) $(XFT_CFLAGS)
++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
Index: patches/patch-src_sound_c
===================================================================
RCS file: /cvs/ports/x11/enlightenment/patches/patch-src_sound_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_sound_c
--- patches/patch-src_sound_c 4 Nov 2014 08:35:57 -0000 1.1
+++ patches/patch-src_sound_c 12 May 2018 04:54:16 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-src_sound_c,v 1.1 2014/11/04 08:35:57 armani Exp $
---- src/sound.c.orig Sun Jul 31 16:02:52 2011
-+++ src/sound.c Sun Nov 11 14:48:28 2012
+Index: src/sound.c
+--- src/sound.c.orig
++++ src/sound.c
@@ -34,6 +34,8 @@
#define SOUND_SERVER_NAME "esd"
#elif HAVE_SOUND_PA
@@ -10,7 +11,7 @@ $OpenBSD: patch-src_sound_c,v 1.1 2014/1
#else
#error Invalid sound configuration
#endif
-@@ -72,6 +74,9 @@ static const SoundOps *ops = &SoundOps_esd;
+@@ -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;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/enlightenment/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST
--- pkg/PLIST 29 Jun 2016 16:14:45 -0000 1.15
+++ pkg/PLIST 12 May 2018 04:54:17 -0000
@@ -6,7 +6,6 @@
@bin bin/eesh
@bin bin/epp
bin/starte16
-lib/e16/
@man man/man1/e16.1
share/applications/e16.desktop
share/doc/e16/
@@ -71,7 +70,7 @@ share/e16/config/e16keyedit.db
share/e16/config/fonts.pango.cfg
share/e16/config/fonts.xft.cfg
share/e16/config/matches.cfg
-share/e16/fonts/
+@fontdir share/e16/fonts/
share/e16/fonts/COPYRIGHT.Vera
share/e16/fonts/Vera.ttf
share/e16/fonts/VeraBd.ttf
@@ -536,7 +535,7 @@ share/e16/themes/BlueSteel/tooltips/imag
share/e16/themes/BlueSteel/tooltips/images/cloud_large.png
share/e16/themes/BlueSteel/tooltips/images/cloud_small.png
share/e16/themes/BlueSteel/tooltips/tooltips.cfg
-share/e16/themes/BlueSteel/ttfonts/
+@fontdir share/e16/themes/BlueSteel/ttfonts/
share/e16/themes/BlueSteel/ttfonts/vixar.ttf
share/e16/themes/BlueSteel/windowmatches.cfg
share/e16/themes/BrushedMetal-Tigert/
@@ -929,7 +928,7 @@ share/e16/themes/BrushedMetal-Tigert/too
share/e16/themes/BrushedMetal-Tigert/tooltips/images/cloud2.png
share/e16/themes/BrushedMetal-Tigert/tooltips/images/cloud_logo.png
share/e16/themes/BrushedMetal-Tigert/tooltips/tooltips.cfg
-share/e16/themes/BrushedMetal-Tigert/ttfonts/
+@fontdir share/e16/themes/BrushedMetal-Tigert/ttfonts/
share/e16/themes/BrushedMetal-Tigert/ttfonts/aircut3.ttf
share/e16/themes/BrushedMetal-Tigert/windowmatches.cfg
share/e16/themes/Ganymede/
@@ -2047,7 +2046,7 @@ share/e16/themes/Ganymede/tooltips/image
share/e16/themes/Ganymede/tooltips/images/bubble_large.png
share/e16/themes/Ganymede/tooltips/images/bubble_small.png
share/e16/themes/Ganymede/tooltips/tooltips.cfg
-share/e16/themes/Ganymede/ttfonts/
+@fontdir share/e16/themes/Ganymede/ttfonts/
share/e16/themes/Ganymede/ttfonts/ganymede.ttf
share/e16/themes/Ganymede/ttfonts/ganymede_italic.ttf
share/e16/themes/Ganymede/windowmatches.cfg
@@ -2428,7 +2427,7 @@ share/e16/themes/ShinyMetal/tooltips/ima
share/e16/themes/ShinyMetal/tooltips/images/ttip_cloud_small.png
share/e16/themes/ShinyMetal/tooltips/images/ttip_help.png
share/e16/themes/ShinyMetal/tooltips/tooltips.cfg
-share/e16/themes/ShinyMetal/ttfonts/
+@fontdir share/e16/themes/ShinyMetal/ttfonts/
share/e16/themes/ShinyMetal/ttfonts/aircut3.ttf
share/e16/themes/ShinyMetal/ttfonts/rothwell.ttf
share/e16/themes/ShinyMetal/ttfonts/zirkle.ttf
@@ -2769,13 +2768,10 @@ share/e16/themes/winter/tooltips/tooltip
share/gnome-session/
share/gnome-session/sessions/
share/gnome-session/sessions/e16-gnome.session
-share/locale/ar/
-share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/e16.mo
share/locale/bg/LC_MESSAGES/e16.mo
-share/locale/bs/
-share/locale/bs/LC_MESSAGES/
share/locale/bs/LC_MESSAGES/e16.mo
+share/locale/ca/LC_MESSAGES/e16.mo
share/locale/cs/LC_MESSAGES/e16.mo
share/locale/csb/
share/locale/csb/LC_MESSAGES/
@@ -2791,6 +2787,7 @@ share/locale/fo/
share/locale/fo/LC_MESSAGES/
share/locale/fo/LC_MESSAGES/e16.mo
share/locale/fr/LC_MESSAGES/e16.mo
+share/locale/gl/LC_MESSAGES/e16.mo
share/locale/hr/LC_MESSAGES/e16.mo
share/locale/hu/LC_MESSAGES/e16.mo
share/locale/it/LC_MESSAGES/e16.mo
@@ -2803,14 +2800,15 @@ share/locale/pt/LC_MESSAGES/e16.mo
share/locale/pt_BR/LC_MESSAGES/e16.mo
share/locale/ru/LC_MESSAGES/e16.mo
share/locale/sk/LC_MESSAGES/e16.mo
+share/locale/sr/LC_MESSAGES/e16.mo
share/locale/sv/LC_MESSAGES/e16.mo
share/locale/tr/LC_MESSAGES/e16.mo
share/locale/uk/LC_MESSAGES/e16.mo
share/locale/zh_CN/LC_MESSAGES/e16.mo
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
@comment share/xsessions/
@comment share/xsessions/e16-gnome2-session.desktop
@comment share/xsessions/e16-gnome3-session.desktop
@comment share/xsessions/e16-kde-session.desktop
@comment share/xsessions/e16-session.desktop
-@exec %D/bin/update-desktop-database
-@unexec-delete %D/bin/update-desktop-database
