[Nel] GNU/Linux packages & patches

[Loic Dachary]

        Hi,

        I'm uploading a new set of packages for nel/nelns/snowballs to
http://people.debian.org/~loic/debian/. I had to do the following patches
to get them to run properly:

        - Add missing declaration for stopCreateInstanceGroupAsync
        - Add protected getQueue() function to task_manager class so
          that derived classes can access it instead of accessing 
          private data member that triggers compilation error
        - Add the usual bunch of missing files in various Makefile.am
        - Add the new common.cfg file of nelns into the list of
          distributed files so that packages can take advantage of
          it to factorize configuration information.
        - Fix some missing c_str in printfs

        Cheers,

--- nel-0.3.20020429.orig/include/nel/3d/u_instance_group.h
+++ nel-0.3.20020429/include/nel/3d/u_instance_group.h
@@ -83,6 +83,7 @@
         */
        static  UInstanceGroup  *createInstanceGroup (const std::string 
&instanceGroup);
        static  void createInstanceGroupAsync (const std::string 
&instanceGroup, UInstanceGroup **pIG);
+       static void stopCreateInstanceGroupAsync (UInstanceGroup **ppIG);
 
        /**
         * Return the count of shape instance in this group.
--- nel-0.3.20020429.orig/include/nel/misc/task_manager.h
+++ nel-0.3.20020429/include/nel/misc/task_manager.h
@@ -70,6 +70,9 @@
        /// return false if exit() is required. task added with addTask() 
should test this flag.
        bool    isThreadRunning() {return _ThreadRunning;}
 
+protected:
+       CSynchronized<std::list<IRunnable *> > *getQueue() { return 
&_TaskQueue; }
+
 private:
        //queue of tasks, using list container instead of queue for DeleteTask 
methode
        CSynchronized<std::list<IRunnable *> > _TaskQueue;
--- nel-0.3.20020429.orig/src/3d/Makefile.am
+++ nel-0.3.20020429/src/3d/Makefile.am
@@ -459,6 +459,8 @@
                        vegetable_shape.h                               \
                        vegetable_sort_block.cpp                        \
                        vegetable_sort_block.h                          \
+                       vegetable_uv8.cpp                               \
+                       vegetable_uv8.h                                 \
                        vertex_buffer.cpp                               \
                        vertex_buffer.h                                 \
                        vertex_buffer_hard.cpp                          \
--- nel-0.3.20020429.orig/src/3d/async_file_manager.cpp
+++ nel-0.3.20020429/src/3d/async_file_manager.cpp
@@ -84,7 +84,7 @@
 
 bool CAsyncFileManager::cancelLoadMesh(const std::string& sMeshName)
 {
-       CSynchronized<list<IRunnable *> >::CAccessor acces(&_TaskQueue);
+       CSynchronized<list<IRunnable *> >::CAccessor acces(getQueue());
        list<IRunnable*> &rTaskQueue = acces.value ();
        list<IRunnable*>::iterator it = rTaskQueue.begin();
 
@@ -146,7 +146,7 @@
 
 void CAsyncFileManager::cancelSignal (bool *pSgn)
 {
-       CSynchronized<list<IRunnable *> >::CAccessor acces(&_TaskQueue);
+       CSynchronized<list<IRunnable *> >::CAccessor acces(getQueue());
        list<IRunnable*> &rTaskQueue = acces.value ();
        list<IRunnable*>::iterator it = rTaskQueue.begin();
 
@@ -223,7 +223,7 @@
                // If the driver is not given so do not try to load the textures
                if ((pMesh == NULL) || (_pDriver == NULL))
                {
-                       nlwarning ("cant load %s", MeshName);
+                       nlwarning ("cant load %s", MeshName.c_str());
                        *_ppShp = (IShape*)-1;
                        delete this;
                        return;
@@ -297,7 +297,7 @@
        }
        catch(EPathNotFound &)
        {
-               nlwarning ("can load %s but cant setup textures or lightmap", 
MeshName);
+               nlwarning ("can load %s but cant setup textures or lightmap", 
MeshName.c_str());
                *_ppShp = (IShape*)-1;
                delete this;
                return;
--- nel-0.3.20020429.orig/src/misc/Makefile.am
+++ nel-0.3.20020429/src/misc/Makefile.am
@@ -30,6 +30,7 @@
                         file.cpp                           \
                         geom_ext.cpp                       \
                         heap_memory.cpp                    \
+                       hierarchical_timer.cpp             \
                         i_xml.cpp                          \
                         i18n.cpp                           \
                         line.cpp                           \
--- nelns-0.3.20020429.orig/Makefile.am
+++ nelns-0.3.20020429/Makefile.am
@@ -28,11 +28,13 @@
        do \
                test -f ${DESTDIR}${pkgsysconfdir}/$${service}_service.cfg || 
cp ${srcdir}/$${service}_service/$${service}_service.cfg 
${DESTDIR}${pkgsysconfdir} ; \
        done
+       test -f ${DESTDIR}${pkgsysconfdir}/common.cfg || cp 
${srcdir}/admin_service/common.cfg ${DESTDIR}${pkgsysconfdir}
 
 uninstall-local:
        for service in admin admin_executor login naming welcome ; \
        do \
                rm -f ${DESTDIR}${pkgsysconfdir}/$${service}_service.cfg ; \
        done
+       rm -f ${DESTDIR}${pkgsysconfdir}/common.cfg
 
 # End of Makefile.am
--- nelns-0.3.20020429.orig/admin_service/Makefile.am
+++ nelns-0.3.20020429/admin_service/Makefile.am
@@ -4,7 +4,8 @@
 
 MAINTAINERCLEANFILES  = Makefile.in
 
-EXTRA_DIST                    = admin_service.cfg \
+EXTRA_DIST                    = common.cfg \
+                                admin_service.cfg \
                                 admin_service.dsp
 
 sbin_PROGRAMS         = admin_service

-- 
Loic   Dachary         http://www.dachary.org/  address@hidden
12 bd  Magenta         http://www.senga.org/      address@hidden
75010    Paris         T: 33 1 42 45 07 97          address@hidden
        GPG Public Key: http://www.dachary.org/loic/gpg.txt