1
--- enigma-1.10~~pre-alpha+r2210.orig/src/Makefile.am
2
+++ enigma-1.10~~pre-alpha+r2210/src/Makefile.am
3
@@ -13,8 +13,6 @@ CXXFLAGS = @CXXFLAGS@\
1
Use system zipios++ instead of the local copy, which was removed
4
Also remove a music file with unclear copyright (probably non DFSG free)
5
Index: enigma-1.20/src/Makefile.am
6
===================================================================
7
--- enigma-1.20.orig/src/Makefile.am 2013-04-06 14:52:07.000000000 +0200
8
+++ enigma-1.20/src/Makefile.am 2013-04-06 14:52:07.000000000 +0200
4
10
-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
5
11
-DDOCDIR=\"$(docdir)\" \
6
12
-DLOCALEDIR=\"$(localedir_enigma)\" \
22
--- enigma-1.10~~pre-alpha+r2210.orig/src/Makefile.in
23
+++ enigma-1.10~~pre-alpha+r2210/src/Makefile.in
24
@@ -150,7 +150,6 @@ enigma_DEPENDENCIES = $(top_builddir)/li
28
Index: enigma-1.20/src/Makefile.in
29
===================================================================
30
--- enigma-1.20.orig/src/Makefile.in 2013-04-06 14:52:07.000000000 +0200
31
+++ enigma-1.20/src/Makefile.in 2013-04-06 14:52:07.000000000 +0200
25
33
$(top_builddir)/lib-src/lua/liblua.a \
26
34
$(top_builddir)/lib-src/enet/libenet.a \
27
35
$(top_builddir)/lib-src/oxydlib/liboxyd.a \
28
36
- $(top_builddir)/lib-src/zipios++/src/libzipios.a \
29
37
$(am__DEPENDENCIES_1)
30
DEFAULT_INCLUDES = -I.@am__isrc@
31
depcomp = $(SHELL) $(top_srcdir)/depcomp
32
@@ -192,8 +191,6 @@ CXXFLAGS = @CXXFLAGS@\
38
enigma_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(enigma_LDFLAGS) \
33
41
-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
34
42
-DDOCDIR=\"$(docdir)\" \
35
43
-DLOCALEDIR=\"$(localedir_enigma)\" \
51
--- enigma-1.10~~pre-alpha+r2210.orig/data/music/menu/Makefile.am
52
+++ enigma-1.10~~pre-alpha+r2210/data/music/menu/Makefile.am
59
Index: enigma-1.20/data/music/menu/Makefile.am
60
===================================================================
61
--- enigma-1.20.orig/data/music/menu/Makefile.am 2013-04-06 14:52:07.000000000 +0200
62
+++ enigma-1.20/data/music/menu/Makefile.am 2013-04-06 14:52:07.000000000 +0200
54
64
pkgdatadir = $(datadir)/@PACKAGE@/music/menu
55
65
pkgdata_DATA = esprit.ogg \
60
70
EXTRA_DIST = $(pkgdata_DATA)
61
--- enigma-1.10~~pre-alpha+r2210.orig/data/music/menu/Makefile.in
62
+++ enigma-1.10~~pre-alpha+r2210/data/music/menu/Makefile.in
63
@@ -227,8 +227,7 @@ top_build_prefix = @top_build_prefix@
71
Index: enigma-1.20/data/music/menu/Makefile.in
72
===================================================================
73
--- enigma-1.20.orig/data/music/menu/Makefile.in 2013-04-06 14:52:07.000000000 +0200
74
+++ enigma-1.20/data/music/menu/Makefile.in 2013-04-06 14:52:07.000000000 +0200
64
76
top_builddir = @top_builddir@
65
77
top_srcdir = @top_srcdir@
66
78
pkgdata_DATA = esprit.ogg \
71
83
EXTRA_DIST = $(pkgdata_DATA)
85
Index: enigma-1.20/lib-src/Makefile.am
86
===================================================================
87
--- enigma-1.20.orig/lib-src/Makefile.am 2013-04-01 20:33:52.000000000 +0200
88
+++ enigma-1.20/lib-src/Makefile.am 2013-04-06 16:00:13.000000000 +0200
90
-SUBDIRS = oxydlib lua zipios++ enet enigma-core
91
+SUBDIRS = oxydlib lua enet enigma-core
92
Index: enigma-1.20/lib-src/Makefile.in
93
===================================================================
94
--- enigma-1.20.orig/lib-src/Makefile.in 2013-04-01 20:38:10.000000000 +0200
95
+++ enigma-1.20/lib-src/Makefile.in 2013-04-06 16:00:26.000000000 +0200
97
top_build_prefix = @top_build_prefix@
98
top_builddir = @top_builddir@
99
top_srcdir = @top_srcdir@
100
-SUBDIRS = oxydlib lua zipios++ enet enigma-core
101
+SUBDIRS = oxydlib lua enet enigma-core
105
Index: enigma-1.20/src/MusicManager.cc
106
===================================================================
107
--- enigma-1.20.orig/src/MusicManager.cc 2013-04-01 20:33:54.000000000 +0200
108
+++ enigma-1.20/src/MusicManager.cc 2013-04-06 16:02:50.000000000 +0200
111
music_singles["Esprit"] =
112
MusicSingle("Esprit", "music/menu/esprit.ogg");
113
- music_singles["Pentagonal Dreams"] =
114
- MusicSingle("Pentagonal Dreams", "music/menu/pentagonal_dreams.s3m");
115
+ //music_singles["Pentagonal Dreams"] =
116
+ // MusicSingle("Pentagonal Dreams", "music/menu/pentagonal_dreams.s3m");
119
music_singles["Across The Ice"] =
121
music_queues["Default"].appendSingle("Esprit", false);
122
music_queues["Default"].appendSingleThenWait("Esprit", true, 8.0);
123
music_queues["Default"].appendSingleThenWait("Enigma Rag", true, 8.0);
124
- music_queues["Default"].appendSingleThenWait("Pentagonal Dreams", true, 8.0);
125
+ //music_queues["Default"].appendSingleThenWait("Pentagonal Dreams", true, 8.0);
127
music_queues["Esprit"] = MusicQueue("Esprit", MUSICQUEUE_NEXT, 1);
128
music_queues["Esprit"].appendSingle("Esprit", false);
130
music_queues["Enigma Rag"] = MusicQueue("Enigma Rag", MUSICQUEUE_NEXT, 2);
131
music_queues["Enigma Rag"].appendSingleThenWait("Enigma Rag", false, 8.0);
133
- music_queues["Pentagonal Dreams"] = MusicQueue("Pentagonal Dreams", MUSICQUEUE_NEXT, 3);
134
- music_queues["Pentagonal Dreams"].appendSingle("Pentagonal Dreams", true);
135
+ //music_queues["Pentagonal Dreams"] = MusicQueue("Pentagonal Dreams", MUSICQUEUE_NEXT, 3);
136
+ //music_queues["Pentagonal Dreams"].appendSingle("Pentagonal Dreams", true);
138
active_music_queue_title = app.state->getString("MenuMusicQueue");
139
// Set the default menu music queue, if saved queue doesn't exist.