Changes between Version 10 and Version 11 of FawkesOnUbuntu


Ignore:
Timestamp:
01/16/13 15:22:53 (6 years ago)
Author:
tim
Comment:

Removed patch, fixed in master

Legend:

Unmodified
Added
Removed
Modified
  • FawkesOnUbuntu

    v10 v11  
    7575sudo git pull 
    7676sudo make clean 
    77  
    78 echo Patches for Ubuntu 12.04 LTS  
    79 echo -notify support and flite libs 
    80  
    81 sudo make >/tmp/fawkes.make.log 
     77sudo make all gui 
    8278 
    8379if [ $? -eq "0" ] ; then 
     
    8783}}} 
    8884 
    89  
    90 For Ubuntu 12.04, this patches to last git version are neccessary to build fawkes 0.5 
    91  
    92 {{{ 
    93 From 022bfe7f7f136286351f2a8942cd251754fe0213 Mon Sep 17 00:00:00 2001 
    94 From: root <root@xadmin-VirtualBox.(none)> 
    95 Date: Mon, 8 Oct 2012 09:28:22 +0200 
    96 Subject: [PATCH] Ubuntu 12.04 LTS inotify includes for x64 flite libs 
    97  flite_cmulex flite_usenglish 
    98  
    99 --- 
    100  src/libs/utils/utils.mk    |    2 +- 
    101  src/plugins/flite/Makefile |    3 ++- 
    102  2 files changed, 3 insertions(+), 2 deletions(-) 
    103  
    104 diff --git a/src/libs/utils/utils.mk b/src/libs/utils/utils.mk 
    105 index 0b9d66b..2aff37e 100644 
    106 --- a/src/libs/utils/utils.mk 
    107 +++ b/src/libs/utils/utils.mk 
    108 @@ -13,7 +13,7 @@ 
    109  # 
    110  #***************************************************************************** 
    111   
    112 -ifneq ($(wildcard /usr/include/sys/inotify.h),) 
    113 +ifneq ($(wildcard /usr/include/sys/inotify.h /usr/include/x86_64-linux-gnu/sys/inotify.h),) 
    114    HAVE_INOTIFY=1 
    115    CFLAGS += -DHAVE_INOTIFY 
    116  endif 
    117 diff --git a/src/plugins/flite/Makefile b/src/plugins/flite/Makefile 
    118 index e121940..8a97848 100644 
    119 --- a/src/plugins/flite/Makefile 
    120 +++ b/src/plugins/flite/Makefile 
    121 @@ -22,7 +22,8 @@ ifeq ($(HAVE_FLITE)$(HAVE_ALSA),11) 
    122    LDFLAGS += $(LDFLAGS_FLITE) $(LDFLAGS_ALSA) 
    123    CFLAGS  += $(CFLAGS_FLITE)  $(CFLAGS_ALSA) 
    124    LIBS_flite = m fawkescore fawkesutils fawkesaspects fawkesblackboard \ 
    125 -              fawkesinterface SpeechSynthInterface flite flite_cmu_us_kal 
    126 +              fawkesinterface SpeechSynthInterface flite flite_cmu_us_kal \ 
    127 +               flite_cmulex flite_usenglish 
    128    OBJS_flite = $(patsubst %.cpp,%.o,$(patsubst qa/%,,$(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/*.cpp)))) 
    129    PLUGINS_all = $(PLUGINDIR)/flite.so 
    130  else 
    131 --  
    132 1.7.9.5 
    133  
    134 }}} 
    13585== Build and running Fawkes == 
    13686After the dependencies are installed you can continue with the [wiki:GettingStartedGuide#CompilingFawkes Getting Started Guide] on how to compile and run Fawkes.