Bug#756788: patch
I already have a patch fixing this bug. I tested the package and it builds after the fix. The patch adds a compiler option which fixes the bug. --- libwebp-0.4.1/debian/rules 2014-01-08 18:14:20.0 + +++ libwebp-0.4.1.mine/debian/rules 2014-08-05 21:21:31.832507772 + @@ -9,6 +9,11 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 +ifneq (,$(findstring mips,$(DEB_HOST_ARCH))) + CFLAGS+= -mips32r2 + export CFLAGS +endif + # dh seems to assume that configure is already there configure: ./autogen.sh signature.asc Description: Digital signature
Bug#756365: patch
TIOCGETC, etc. are not supported on MIPS.
This patch modifies several macros to make the package compile on MIPS.
--- hyperic-sigar-1.6.4+dfsg/src/sigar_getline.c 2013-01-27 22:39:57.0 +
+++ hyperic-sigar-1.6.4+dfsg.mine/src/sigar_getline.c 2014-07-29 09:17:56.888202734 +
@@ -362,7 +362,7 @@
#endif
#if defined(TIOCGETP) !defined(__sgi) !defined(R__MKLINUX) \
- !defined(R__ALPHALINUX) /* use BSD interface if possible */
+ !defined(R__ALPHALINUX) !defined(__mips__) /* use BSD interface if possible */
#include sgtty.h
static struct sgttyb new_tty, old_tty;
static struct tchars tch;
@@ -371,7 +371,7 @@
#ifdef SIGTSTP /* need POSIX interface to handle SUSP */
#include termios.h
#if defined(__sun) || defined(__sgi) || defined(R__MKLINUX) || \
-defined(R__ALPHALINUX)
+defined(R__ALPHALINUX) || defined(__mips__)
#undef TIOCGETP /* Solaris and SGI define TIOCGETP in termios.h */
#undef TIOCSETP
#endif
@@ -412,7 +412,7 @@
{
if (gl_notty) return;
#ifdef unix
-#ifdef TIOCGETP /* BSD */
+#if defined(TIOCGETP) !defined(__mips__) /* BSD */
ioctl(0, TIOCGETC, tch);
ioctl(0, TIOCGLTC, ltch);
gl_intrc = tch.t_intrc;
signature.asc
Description: Digital signature
Bug#756406: patch
This patch adds missing macro definitions for a system call. --- tiptop-2.2/src/pmc.c 2013-02-28 13:44:24.0 + +++ tiptop-2.2.mine/src/pmc.c 2014-07-29 14:36:43.306527775 + @@ -28,6 +28,12 @@ #define __NR_perf_counter_open 336 #elif defined(TARGET_SPARC) #define __NR_perf_counter_open 327 +#elif defined(__mips__) defined(_ABIO32) +#define __NR_perf_counter_open 4333 +#elif defined(__mips__) defined(_ABIN32) +#define __NR_perf_counter_open 6296 +#elif defined(__mips__) defined(_ABI64) +#define __NR_perf_counter_open 5292 #endif long sys_perf_counter_open(struct STRUCT_NAME *hw_event, signature.asc Description: Digital signature
Bug#754619: works for me
I just tried building sdformat on MIPS and it build successfully with all tests passing. I suppose we should try building it again. signature.asc Description: Digital signature
Bug#755193: patch
This patch removes a compiler macro definition that conflicts with the name of a variable. diff -urN capstone-2.1.2/Makefile capstone-2.1.2.mine/Makefile --- capstone-2.1.2/Makefile 2014-07-18 17:05:08.0 + +++ capstone-2.1.2.mine/Makefile 2014-07-18 17:08:15.116546624 + @@ -104,7 +104,7 @@ LIBOBJ_MIPS = ifneq (,$(findstring mips,$(CAPSTONE_ARCHS))) - CFLAGS += -DCAPSTONE_HAS_MIPS + CFLAGS += -DCAPSTONE_HAS_MIPS -Umips LIBOBJ_MIPS += arch/Mips/MipsDisassembler.o LIBOBJ_MIPS += arch/Mips/MipsInstPrinter.o LIBOBJ_MIPS += arch/Mips/MipsMapping.o signature.asc Description: Digital signature
Bug#754489: patch
Under MIPS, the atomicity of some operations is not guaranteed and so an alternative implementation with a mutex is used. The compiler complains because the code is trying to change a variable (the mutex) from a const method of a class. This patch adds mutable modifier to the mentioned variable. diff -urN percona-xtradb-cluster-5.5-5.5.37-25.10+dfsg/sql/query_response_time.cc percona-xtradb-cluster-5.5-5.5.37-25.10+dfsg.minee/sql/query_response_time.cc --- percona-xtradb-cluster-5.5-5.5.37-25.10+dfsg/sql/query_response_time.cc 2014-05-08 00:58:25.0 + +++ percona-xtradb-cluster-5.5-5.5.37-25.10+dfsg.minee/sql/query_response_time.cc 2014-07-11 16:55:52.939978748 + @@ -198,7 +198,7 @@ /* The lock for atomic operations on m_count and m_total. Only actually used on architectures that do not have atomic implementation of atomic operations. */ - my_atomic_rwlock_t time_collector_lock; + mutable my_atomic_rwlock_t time_collector_lock; uint32 m_count[OVERALL_POWER_COUNT + 1]; uint64 m_total[OVERALL_POWER_COUNT + 1]; }; signature.asc Description: Digital signature
Bug#752693: patch explanation
The version was 0.1.4 when I last looked at auto-building interface. I added pkg-config to fix this problem: -- Could NOT find PkgConfig (missing: PKG_CONFIG_EXECUTABLE) signature.asc Description: Digital signature
Bug#750382: works for me on mips
I tested the package on a MIPS system and it built successfully. All the tests passed. Here is part of the log: make[4]: Leaving directory '/root/lhasa/lhasa-0.2.0+git/test' make check-TESTS make[4]: Entering directory '/root/lhasa/lhasa-0.2.0+git/test' make[5]: Entering directory '/root/lhasa/lhasa-0.2.0+git/test' PASS: test-crc16 PASS: test-basic-reader PASS: test-decoder PASS: test-decompress PASS: test-file-headers PASS: test-list-output PASS: test-crc-output PASS: test-print PASS: test-dry-run PASS: test-extract make[6]: Entering directory '/root/lhasa/lhasa-0.2.0+git/test' make[6]: Nothing to be done for 'all'. make[6]: Leaving directory '/root/lhasa/lhasa-0.2.0+git/test' Testsuite summary for Lhasa 0.2.0 # TOTAL: 10 # PASS: 10 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 make[5]: Leaving directory '/root/lhasa/lhasa-0.2.0+git/test' make[4]: Leaving directory '/root/lhasa/lhasa-0.2.0+git/test' make[3]: Leaving directory '/root/lhasa/lhasa-0.2.0+git/test' make[3]: Entering directory '/root/lhasa/lhasa-0.2.0+git' make[3]: Leaving directory '/root/lhasa/lhasa-0.2.0+git' make[2]: Leaving directory '/root/lhasa/lhasa-0.2.0+git' make[1]: Leaving directory '/root/lhasa/lhasa-0.2.0+git' fakeroot debian/rules binary prefix=/usr dh binary --parallel I think we should try to build this one again through the auto-building system on MIPS. If it fails again, I'll look into the differences to find where the problem is. Plamen signature.asc Description: Digital signature
Bug#749367: updated patch
I just look at the patch provided by Aleksandar. I believe unaligned access is
still possible after applying it.
The reason is that an auto array of uint8_t is still only guaranteed to be
1-byte aligned. These discussions confirm this:
http://stackoverflow.com/questions/4009463/alignment-of-char-arrays
http://bytes.com/topic/c/answers/811633-alignment-stack-arrays
So I updated the patch to fix this issue.
Plamen
diff -urN htslib-0.2.0~rc3/htslib/hts.h htslib-0.2.0~rc3.mine/htslib/hts.h
--- htslib-0.2.0~rc3/htslib/hts.h 2014-06-26 14:09:17.0 +
+++ htslib-0.2.0~rc3.mine/htslib/hts.h 2014-06-26 14:22:45.794658401 +
@@ -238,7 +238,18 @@
}
static inline void *ed_swap_2p(void *x)
{
+#ifdef ALLOW_UAC
*(uint16_t*)x = ed_swap_2(*(uint16_t*)x);
+#else
+uint16_t tmpDataBuffer;
+uint8_t *tmpData = (uint8_t *)tmpDataBuffer;
+uint16_t *ptmpData = (uint16_t*)tmpData;
+ uint8_t *px = (uint8_t*)x;
+ int j;
+ for(j=0;j2;j++) tmpData[j] = px[j];
+*ptmpData = ed_swap_2(*ptmpData);
+ for(j=0;j2;j++) px[j] = tmpData[j];
+#endif
return x;
}
static inline uint32_t ed_swap_4(uint32_t v)
@@ -248,7 +259,18 @@
}
static inline void *ed_swap_4p(void *x)
{
+#ifdef ALLOW_UAC
*(uint32_t*)x = ed_swap_4(*(uint32_t*)x);
+#else
+uint32_t tmpDataBuffer;
+uint8_t *tmpData = (uint8_t *)tmpDataBuffer;
+ uint32_t *ptmpData = (uint32_t*)tmpData;
+ uint8_t *px = (uint8_t*)x;
+ int j;
+ for(j=0;j4;j++) tmpData[j] = px[j];
+ *ptmpData = ed_swap_4(*ptmpData);
+ for(j=0;j4;j++) px[j] = tmpData[j];
+#endif
return x;
}
static inline uint64_t ed_swap_8(uint64_t v)
@@ -259,7 +281,18 @@
}
static inline void *ed_swap_8p(void *x)
{
+#ifdef ALLOW_UAC
*(uint64_t*)x = ed_swap_8(*(uint64_t*)x);
+#else
+uint64_t tmpDataBuffer;
+uint8_t *tmpData = (uint8_t *)tmpDataBuffer;
+ uint64_t *ptmpData = (uint64_t*)tmpData;
+ uint8_t *px = (uint8_t*)x;
+ int j;
+ for(j=0;j8;j++) tmpData[j] = px[j];
+ *ptmpData = ed_swap_8(*ptmpData);
+ for(j=0;j8;j++) px[j] = tmpData[j];
+#endif
return x;
}
diff -urN htslib-0.2.0~rc3/sam.c htslib-0.2.0~rc3.mine/sam.c
--- htslib-0.2.0~rc3/sam.c 2014-06-26 14:09:17.0 +
+++ htslib-0.2.0~rc3.mine/sam.c 2014-06-26 14:23:27.282606547 +
@@ -7,6 +7,7 @@
#include htslib/sam.h
#include htslib/bgzf.h
#include cram/cram.h
+#include cram/os.h
#include hfile.h
#include htslib/khash.h
@@ -713,18 +714,70 @@
s = bam_get_aux(b); // aux
while (s b-data + b-l_data) {
uint8_t type, key[2];
+ uint64_t tmpDataBuffer;
+ uint8_t *tmpData = (uint8_t *)tmpDataBuffer;
+ int j;
key[0] = s[0]; key[1] = s[1];
s += 2; type = *s++;
kputc('\t', str); kputsn((char*)key, 2, str); kputc(':', str);
if (type == 'A') { kputsn(A:, 2, str); kputc(*s, str); ++s; }
else if (type == 'C') { kputsn(i:, 2, str); kputw(*s, str); ++s; }
else if (type == 'c') { kputsn(i:, 2, str); kputw(*(int8_t*)s, str); ++s; }
+#ifdef ALLOW_UAC
else if (type == 'S') { kputsn(i:, 2, str); kputw(*(uint16_t*)s, str); s += 2; }
else if (type == 's') { kputsn(i:, 2, str); kputw(*(int16_t*)s, str); s += 2; }
else if (type == 'I') { kputsn(i:, 2, str); kputuw(*(uint32_t*)s, str); s += 4; }
else if (type == 'i') { kputsn(i:, 2, str); kputw(*(int32_t*)s, str); s += 4; }
else if (type == 'f') { ksprintf(str, f:%g, *(float*)s); s += 4; }
else if (type == 'd') { ksprintf(str, d:%g, *(double*)s); s += 8; }
+#else
+ else if (type == 'S')
+{
+uint16_t *ptmpData = (uint16_t*)tmpData;
+for(j=0;j2;j++) tmpData[j]=s[j];
+kputsn(i:, 2, str);
+kputw(*ptmpData, str);
+s += 2;
+}
+ else if (type == 's')
+{
+int16_t *ptmpData = (int16_t*)tmpData;
+for(j=0;j2;j++) tmpData[j]=s[j];
+kputsn(i:, 2, str);
+kputw(*ptmpData, str);
+s += 2;
+}
+ else if (type == 'I')
+{
+uint32_t *ptmpData = (uint32_t*)tmpData;
+for(j=0;j4;j++) tmpData[j]=s[j];
+kputsn(i:, 2, str);
+kputuw(*ptmpData, str);
+s += 4;
+}
+ else if (type == 'i')
+{
+int32_t *ptmpData = (int32_t*)tmpData;
+for(j=0;j4;j++) tmpData[j]=s[j];
+kputsn(i:, 2, str);
+kputw(*ptmpData, str);
+s += 4;
+}
+ else if (type == 'f')
+{
+float *ptmpData = (float*)tmpData;
+for(j=0;j4;j++) tmpData[j]=s[j];
+ksprintf(str, f:%g, *ptmpData);
+s += 4;
+}
+ else if (type == 'd')
+{
+float *ptmpData = (float*)tmpData;
+
Bug#752693: patch
This patch fixes deprecated function errors and missing dependency in the
control file.
diff -Nru u1db-0.1.4/src/u1db_http_sync_target.c u1db-0.1.4.mine/src/u1db_http_sync_target.c
--- u1db-0.1.4/src/u1db_http_sync_target.c 2012-09-26 17:35:34.0 +
+++ u1db-0.1.4.mine/src/u1db_http_sync_target.c 2014-06-25 15:05:42.951423246 +
@@ -458,7 +458,7 @@
status = U1DB_NOMEM;
goto finish;
}
-obj = json_object_object_get(json, target_replica_uid);
+json_object_object_get_ex(json, target_replica_uid, obj);
if (obj == NULL) {
status = U1DB_INVALID_HTTP_RESPONSE;
goto finish;
@@ -482,13 +482,13 @@
status = U1DB_NOMEM;
goto finish;
}
-obj = json_object_object_get(json, target_replica_generation);
+json_object_object_get_ex(json, target_replica_generation, obj);
if (obj == NULL) {
status = U1DB_INVALID_HTTP_RESPONSE;
goto finish;
}
*st_gen = json_object_get_int(obj);
-obj = json_object_object_get(json, target_replica_transaction_id);
+json_object_object_get_ex(json, target_replica_transaction_id, obj);
if (obj == NULL) {
status = U1DB_INVALID_HTTP_RESPONSE;
goto finish;
@@ -503,13 +503,13 @@
goto finish;
}
}
-obj = json_object_object_get(json, source_replica_generation);
+json_object_object_get_ex(json, source_replica_generation, obj);
if (obj == NULL) {
status = U1DB_INVALID_HTTP_RESPONSE;
goto finish;
}
*source_gen = json_object_get_int(obj);
-obj = json_object_object_get(json, source_transaction_id);
+json_object_object_get_ex(json, source_transaction_id, obj);
if (obj == NULL) {
*trans_id = NULL;
} else {
@@ -920,14 +920,14 @@
goto finish;
}
obj = json_object_array_get_idx(json, 0);
-attr = json_object_object_get(obj, new_generation);
+json_object_object_get_ex(obj, new_generation, attr);
if (attr == NULL) {
//printf(broken 3\n);
status = U1DB_BROKEN_SYNC_STREAM;
goto finish;
}
*target_gen = json_object_get_int(attr);
-attr = json_object_object_get(obj, new_transaction_id);
+json_object_object_get_ex(obj, new_transaction_id, attr);
if (attr == NULL) {
//printf(broken 4\n);
status = U1DB_BROKEN_SYNC_STREAM;
@@ -946,7 +946,7 @@
}
if (autocreated_replica_uid != NULL) {
-attr = json_object_object_get(obj, replica_uid);
+json_object_object_get_ex(obj, replica_uid, attr);
if (attr != NULL) {
tmp = json_object_get_string(attr);
if (tmp == NULL) {
@@ -964,15 +964,15 @@
for (i = 1; i doc_count; ++i) {
obj = json_object_array_get_idx(json, i);
-attr = json_object_object_get(obj, id);
+json_object_object_get_ex(obj, id, attr);
doc_id = json_object_get_string(attr);
-attr = json_object_object_get(obj, rev);
+json_object_object_get_ex(obj, rev, attr);
rev = json_object_get_string(attr);
-attr = json_object_object_get(obj, content);
+json_object_object_get_ex(obj, content, attr);
content = json_object_get_string(attr);
-attr = json_object_object_get(obj, gen);
+json_object_object_get_ex(obj, gen, attr);
gen = json_object_get_int(attr);
-attr = json_object_object_get(obj, trans_id);
+json_object_object_get_ex(obj, trans_id, attr);
trans_id = json_object_get_string(attr);
status = u1db__allocate_document(doc_id, rev, content, 0, doc);
if (status != U1DB_OK)
diff -Nru u1db-0.1.4/src/u1db_query.c u1db-0.1.4.mine/src/u1db_query.c
--- u1db-0.1.4/src/u1db_query.c 2014-06-25 13:25:53.0 +
+++ u1db-0.1.4.mine/src/u1db_query.c 2014-06-25 15:28:59.381677937 +
@@ -306,7 +306,7 @@
if (!json_object_is_type(obj, json_type_object)) {
goto finish;
}
-val = json_object_object_get(obj, field-data);
+json_object_object_get_ex(obj, field-data, val);
if (val == NULL)
goto finish;
if (field-next != NULL) {
diff -Nru u1db-0.1.4/debian/control u1db-0.1.4.mine/debian/control
--- u1db-0.1.4/debian/control 2013-06-23 18:15:07.0 +
+++ u1db-0.1.4.mine/debian/control 2014-06-25 13:28:45.218694460 +
@@ -20,7 +20,8 @@
python-setuptools,
python-simplejson,
python-testscenarios,
- python-testtools
+ python-testtools,
+ pkg-config
Maintainer: Micah Anderson mi...@debian.org
Standards-Version: 3.9.4
X-Python-Version: = 2.6
signature.asc
Description: Digital signature
Bug#695563: works with the new kernel
Since #751417 is now fixed, liblinux-prctl-perl now builds on MIPS and MIPSel. I just tested it with linux-image-3.14-1-5kc-malta mips 3.14.7-1 and it compiles successfully. signature.asc Description: Digital signature
Bug#748685: patch for bibletime 2.9
This patch fixes the compilation of bibletime 2.9 with libsword 1.7.
diff -urN bibletime-2.9.2/cmake/sword_linker_check.cpp bibletime-2.9.2.mine/cmake/sword_linker_check.cpp
--- bibletime-2.9.2/cmake/sword_linker_check.cpp 2013-06-03 18:08:52.0 +
+++ bibletime-2.9.2.mine/cmake/sword_linker_check.cpp 2014-06-16 12:49:05.979470653 +
@@ -15,13 +15,13 @@
#include swmgr.h
#include installmgr.h
-#include ftptrans.h
+#include curlftpt.h
int main(int argc, char* argv[])
{
sword::SWMgr mgr;
sword::InstallMgr imgr;
-sword::FTPTransport trans(example.com);
+sword::CURLFTPTransport CURLFTPTransport(example.com);
return 0;
}
diff -urN bibletime-2.9.2/src/backend/rendering/centrydisplay.h bibletime-2.9.2.mine/src/backend/rendering/centrydisplay.h
--- bibletime-2.9.2/src/backend/rendering/centrydisplay.h 2013-06-03 18:08:52.0 +
+++ bibletime-2.9.2.mine/src/backend/rendering/centrydisplay.h 2014-06-16 14:28:00.972395181 +
@@ -35,6 +35,7 @@
const DisplayOptions displayOptions,
const FilterOptions filterOptions);
+ virtual char display(sword::SWModule mod) { (void)mod; return 'c';}
}; /* class CEntryDisplay */
} /* namespace Rendering */
diff -urN bibletime-2.9.2/src/bibletime.cpp bibletime-2.9.2.mine/src/bibletime.cpp
--- bibletime-2.9.2/src/bibletime.cpp 2013-06-03 18:08:52.0 +
+++ bibletime-2.9.2.mine/src/bibletime.cpp 2014-06-17 09:06:12.656074834 +
@@ -285,7 +285,7 @@
const int maxIndex = 31100;
int newIndex = rand() % maxIndex;
vk.setPosition(sword::TOP);
-vk.Index(newIndex);
+vk.setIndex(newIndex);
createReadDisplayWindow(bible, vk.key());
} else {
createReadDisplayWindow(bible, bibleKey);
diff -urN bibletime-2.9.2/src/frontend/bookshelfmanager/btinstallmgr.cpp bibletime-2.9.2.mine/src/frontend/bookshelfmanager/btinstallmgr.cpp
--- bibletime-2.9.2/src/frontend/bookshelfmanager/btinstallmgr.cpp 2013-06-03 18:08:52.0 +
+++ bibletime-2.9.2.mine/src/frontend/bookshelfmanager/btinstallmgr.cpp 2014-06-17 09:55:32.442530952 +
@@ -18,7 +18,7 @@
// Sword includes:
#include installmgr.h
-#include ftptrans.h
+#include curlftpt.h
using namespace sword;
diff -urN bibletime-2.9.2/src/frontend/bookshelfmanager/btinstallmgr.h bibletime-2.9.2.mine/src/frontend/bookshelfmanager/btinstallmgr.h
--- bibletime-2.9.2/src/frontend/bookshelfmanager/btinstallmgr.h 2013-06-03 18:08:52.0 +
+++ bibletime-2.9.2.mine/src/frontend/bookshelfmanager/btinstallmgr.h 2014-06-17 09:53:52.314448110 +
@@ -18,7 +18,7 @@
// Sword includes:
#include installmgr.h
-#include ftptrans.h
+#include curlftpt.h
/**
signature.asc
Description: Digital signature
Bug#747784: patch
compilation fix for xiphos with libsword 1.7
diff -urN xiphos-3.1.5+dfsg/src/backend/module_manager.cc xiphos-3.1.5+dfsg.mine/src/backend/module_manager.cc
--- xiphos-3.1.5+dfsg/src/backend/module_manager.cc 2012-02-25 22:50:47.0 +
+++ xiphos-3.1.5+dfsg.mine/src/backend/module_manager.cc 2014-06-09 10:07:57.921822742 +
@@ -122,7 +122,7 @@
}
-char *backend_mod_mgr_get_config_entry(char *module_name,
+char *backend_mod_mgr_get_config_entry(const char *module_name,
const char *entry) {
SWModule *mod;
ModMap::iterator it; //-- iteratior
@@ -168,13 +168,13 @@
if (list_it != list_end) {
module = list_it-second;
mod_info = g_new(MOD_MGR, 1);
- gchar *name = module-Name();
+ const gchar *name = module-getName();
if (name) {
mod_info-name = g_strdup(name);
mod_info-language =
main_get_language_map(module-Lang());
- mod_info-type = g_strdup(module-Type());
+ mod_info-type = g_strdup(module-getType());
mod_info-about = g_strdup((char *)module-getConfigEntry(About));
char *vers = (char *)module-getConfigEntry(Version);
@@ -213,7 +213,7 @@
backend_mod_mgr_get_config_entry(name, Version);
mod_info-installed =
backend_mod_mgr_is_module(name);
- mod_info-description = module-Description();
+ mod_info-description = (char *)module-getDescription();
mod_info-locked =
((module-getConfigEntry(CipherKey)) ? 1 : 0);
list_it++;
@@ -318,7 +318,7 @@
return -1;
}
module = it-second;
- retval = installMgr-removeModule(tmp_mgr, module-Name());
+ retval = installMgr-removeModule(tmp_mgr, module-getName());
delete tmp_mgr;
return retval;
}
@@ -750,7 +750,7 @@
if (installMgr)
delete installMgr;
- installMgr = new InstallMgr(baseDir,
+ installMgr = new InstallMgr(baseDir.c_str(),
statusReporter,
(SWBuf)ftp,
(SWBuf)xip...@xiphos.org);
diff -urN xiphos-3.1.5+dfsg/src/backend/module_manager.hh xiphos-3.1.5+dfsg.mine/src/backend/module_manager.hh
--- xiphos-3.1.5+dfsg/src/backend/module_manager.hh 2012-02-25 22:50:47.0 +
+++ xiphos-3.1.5+dfsg.mine/src/backend/module_manager.hh 2014-06-09 09:43:55.404508602 +
@@ -27,7 +27,9 @@
#include installmgr.h
#include filemgr.h
-#include ftptrans.h
+#include remotetrans.h
+//#include ftptrans.h
+//#include curlftpt.h
using namespace std;
using namespace sword;
diff -urN xiphos-3.1.5+dfsg/src/backend/sword_main.cc xiphos-3.1.5+dfsg.mine/src/backend/sword_main.cc
--- xiphos-3.1.5+dfsg/src/backend/sword_main.cc 2012-02-25 22:50:47.0 +
+++ xiphos-3.1.5+dfsg.mine/src/backend/sword_main.cc 2014-06-09 10:22:27.410612461 +
@@ -131,23 +131,23 @@
for (it = main_mgr-Modules.begin();
it != main_mgr-Modules.end(); it++) {
display_mod = (*it).second;
- if (!strcmp(display_mod-Type(), TEXT_MODS)) {
+ if (!strcmp(display_mod-getType(), TEXT_MODS)) {
display_mod-setDisplay(textDisplay);
}
- if (!strcmp(display_mod-Type(), COMM_MODS)) {
+ if (!strcmp(display_mod-getType(), COMM_MODS)) {
display_mod-setDisplay(commDisplay);
}
- if (!strcmp(display_mod-Type(), DICT_MODS)) {
+ if (!strcmp(display_mod-getType(), DICT_MODS)) {
display_mod-setDisplay(dictDisplay);
}
- if (!strcmp(display_mod-Type(), BOOK_MODS)) {
+ if (!strcmp(display_mod-getType(), BOOK_MODS)) {
display_mod-setDisplay(bookDisplay);
}
}
} else if (gsType == 1) { // dialogs
for (it = main_mgr-Modules.begin(); it != main_mgr-Modules.end(); it++) {
display_mod = (*it).second;
- if (!strcmp(display_mod-Type(), TEXT_MODS)) {
+ if (!strcmp(display_mod-getType(), TEXT_MODS)) {
display_mod-setDisplay(chapDisplay);
} else {
display_mod-setDisplay(entryDisplay);
@@ -167,61 +167,61 @@
for (it = main_mgr-Modules.begin();
it != main_mgr-Modules.end(); it++) {
- if (!strcmp((*it).second-Type(), TEXT_MODS)) {
+ if (!strcmp((*it).second-getType(), TEXT_MODS)) {
mods-biblemods =
g_list_append(mods-biblemods,
-strdup((char *) (*it).second-Name()));
+strdup((char *) (*it).second-getName()));
mods-text_descriptions =
g_list_append(mods-text_descriptions,
strdup((char *) (*it).second-
- Description()));
+ getDescription()));
}
- if (!strcmp((*it).second-Type(), COMM_MODS)) {
+ if (!strcmp((*it).second-getType(), COMM_MODS)) {
mods-commentarymods =
g_list_append(mods-commentarymods,
- strdup((char *) (*it).second-Name()));
+ strdup((char *) (*it).second-getName()));
mods-comm_descriptions =
g_list_append(mods-comm_descriptions,
strdup((char *) (*it).second-
- Description()));
+ getDescription()));
if (!strcmp((*it).second-getConfigEntry(ModDrv)
, RawFiles)) {
mods-percommods = g_list_append(mods-percommods,
-strdup((char *) (*it).second-Name()));
+strdup((char *) (*it).second-getName()));
}
}
- if (!strcmp((*it).second-Type(),
Bug#751023: patch
This patch makes the current version of xiphos compile with libsword 1.7
diff -urN xiphos-3.1.5+dfsg/src/backend/module_manager.cc xiphos-3.1.5+dfsg.mine/src/backend/module_manager.cc
--- xiphos-3.1.5+dfsg/src/backend/module_manager.cc 2012-02-25 22:50:47.0 +
+++ xiphos-3.1.5+dfsg.mine/src/backend/module_manager.cc 2014-06-09 10:07:57.921822742 +
@@ -122,7 +122,7 @@
}
-char *backend_mod_mgr_get_config_entry(char *module_name,
+char *backend_mod_mgr_get_config_entry(const char *module_name,
const char *entry) {
SWModule *mod;
ModMap::iterator it; //-- iteratior
@@ -168,13 +168,13 @@
if (list_it != list_end) {
module = list_it-second;
mod_info = g_new(MOD_MGR, 1);
- gchar *name = module-Name();
+ const gchar *name = module-getName();
if (name) {
mod_info-name = g_strdup(name);
mod_info-language =
main_get_language_map(module-Lang());
- mod_info-type = g_strdup(module-Type());
+ mod_info-type = g_strdup(module-getType());
mod_info-about = g_strdup((char *)module-getConfigEntry(About));
char *vers = (char *)module-getConfigEntry(Version);
@@ -213,7 +213,7 @@
backend_mod_mgr_get_config_entry(name, Version);
mod_info-installed =
backend_mod_mgr_is_module(name);
- mod_info-description = module-Description();
+ mod_info-description = (char *)module-getDescription();
mod_info-locked =
((module-getConfigEntry(CipherKey)) ? 1 : 0);
list_it++;
@@ -318,7 +318,7 @@
return -1;
}
module = it-second;
- retval = installMgr-removeModule(tmp_mgr, module-Name());
+ retval = installMgr-removeModule(tmp_mgr, module-getName());
delete tmp_mgr;
return retval;
}
@@ -750,7 +750,7 @@
if (installMgr)
delete installMgr;
- installMgr = new InstallMgr(baseDir,
+ installMgr = new InstallMgr(baseDir.c_str(),
statusReporter,
(SWBuf)ftp,
(SWBuf)xip...@xiphos.org);
diff -urN xiphos-3.1.5+dfsg/src/backend/module_manager.hh xiphos-3.1.5+dfsg.mine/src/backend/module_manager.hh
--- xiphos-3.1.5+dfsg/src/backend/module_manager.hh 2012-02-25 22:50:47.0 +
+++ xiphos-3.1.5+dfsg.mine/src/backend/module_manager.hh 2014-06-09 09:43:55.404508602 +
@@ -27,7 +27,9 @@
#include installmgr.h
#include filemgr.h
-#include ftptrans.h
+#include remotetrans.h
+//#include ftptrans.h
+//#include curlftpt.h
using namespace std;
using namespace sword;
diff -urN xiphos-3.1.5+dfsg/src/backend/sword_main.cc xiphos-3.1.5+dfsg.mine/src/backend/sword_main.cc
--- xiphos-3.1.5+dfsg/src/backend/sword_main.cc 2012-02-25 22:50:47.0 +
+++ xiphos-3.1.5+dfsg.mine/src/backend/sword_main.cc 2014-06-09 10:22:27.410612461 +
@@ -131,23 +131,23 @@
for (it = main_mgr-Modules.begin();
it != main_mgr-Modules.end(); it++) {
display_mod = (*it).second;
- if (!strcmp(display_mod-Type(), TEXT_MODS)) {
+ if (!strcmp(display_mod-getType(), TEXT_MODS)) {
display_mod-setDisplay(textDisplay);
}
- if (!strcmp(display_mod-Type(), COMM_MODS)) {
+ if (!strcmp(display_mod-getType(), COMM_MODS)) {
display_mod-setDisplay(commDisplay);
}
- if (!strcmp(display_mod-Type(), DICT_MODS)) {
+ if (!strcmp(display_mod-getType(), DICT_MODS)) {
display_mod-setDisplay(dictDisplay);
}
- if (!strcmp(display_mod-Type(), BOOK_MODS)) {
+ if (!strcmp(display_mod-getType(), BOOK_MODS)) {
display_mod-setDisplay(bookDisplay);
}
}
} else if (gsType == 1) { // dialogs
for (it = main_mgr-Modules.begin(); it != main_mgr-Modules.end(); it++) {
display_mod = (*it).second;
- if (!strcmp(display_mod-Type(), TEXT_MODS)) {
+ if (!strcmp(display_mod-getType(), TEXT_MODS)) {
display_mod-setDisplay(chapDisplay);
} else {
display_mod-setDisplay(entryDisplay);
@@ -167,61 +167,61 @@
for (it = main_mgr-Modules.begin();
it != main_mgr-Modules.end(); it++) {
- if (!strcmp((*it).second-Type(), TEXT_MODS)) {
+ if (!strcmp((*it).second-getType(), TEXT_MODS)) {
mods-biblemods =
g_list_append(mods-biblemods,
-strdup((char *) (*it).second-Name()));
+strdup((char *) (*it).second-getName()));
mods-text_descriptions =
g_list_append(mods-text_descriptions,
strdup((char *) (*it).second-
- Description()));
+ getDescription()));
}
- if (!strcmp((*it).second-Type(), COMM_MODS)) {
+ if (!strcmp((*it).second-getType(), COMM_MODS)) {
mods-commentarymods =
g_list_append(mods-commentarymods,
- strdup((char *) (*it).second-Name()));
+ strdup((char *) (*it).second-getName()));
mods-comm_descriptions =
g_list_append(mods-comm_descriptions,
strdup((char *) (*it).second-
- Description()));
+ getDescription()));
if (!strcmp((*it).second-getConfigEntry(ModDrv)
, RawFiles)) {
mods-percommods = g_list_append(mods-percommods,
-strdup((char *) (*it).second-Name()));
+strdup((char *) (*it).second-getName()));
}
}
- if
Bug#751383: patch
This patch fixes endian detection for rhmessaging so that it can compile on mips. diff -uNr rhmessaging-0.16/lib/jrnl/jcfg.hpp rhmessaging-0.16.mine/lib/jrnl/jcfg.hpp --- rhmessaging-0.16/lib/jrnl/jcfg.hpp 2011-12-05 16:14:39.0 + +++ rhmessaging-0.16.mine/lib/jrnl/jcfg.hpp 2014-06-12 09:43:38.804025937 + @@ -33,10 +33,10 @@ #ifndef mrg_journal_jcfg_hpp #define mrg_journal_jcfg_hpp -#if defined(__i386__) /* little endian, 32 bits */ +#if defined(__i386__) || defined(__mipsel__) /* little endian, 32 bits */ #define JRNL_LITTLE_ENDIAN #define JRNL_32_BIT -#elif defined(__PPC__) || defined(__s390__) /* big endian, 32 bits */ +#elif defined(__PPC__) || defined(__s390__) || defined(__mips__) /* big endian, 32 bits */ #define JRNL_BIG_ENDIAN #define JRNL_32_BIT #elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) /* little endian, 64 bits */ diff -uNr rhmessaging-0.16/lib/jrnl2/Configuration.hpp rhmessaging-0.16.mine/lib/jrnl2/Configuration.hpp --- rhmessaging-0.16/lib/jrnl2/Configuration.hpp 2011-01-14 19:52:45.0 + +++ rhmessaging-0.16.mine/lib/jrnl2/Configuration.hpp 2014-06-12 09:41:52.100068027 + @@ -34,10 +34,10 @@ #include stdint.h // uint8_t -#if defined(__i386__) /* little endian, 32 bits */ +#if defined(__i386__) || defined(__mipsel__) /* little endian, 32 bits */ #define JRNL_LITTLE_ENDIAN // #define JRNL_32_BIT -#elif defined(__PPC__) || defined(__s390__) /* big endian, 32 bits */ +#elif defined(__PPC__) || defined(__s390__) || defined(__mips__) /* big endian, 32 bits */ #define JRNL_BIG_ENDIAN // #define JRNL_32_BIT #elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) /* little endian, 64 bits */ signature.asc Description: Digital signature
Bug#751409: patch for endian.h
This patch changes the endian conversion macros in endian.h to cast their result to the unsigned type of the corresponding size (as described in the bug report). diff -urN eglibc-2.19/string/endian.h eglibc-2.19.mine/string/endian.h --- eglibc-2.19/string/endian.h 2014-01-03 17:51:28.0 + +++ eglibc-2.19.mine/string/endian.h 2014-06-12 15:35:25.192649179 + @@ -58,37 +58,38 @@ #if defined __USE_BSD !defined __ASSEMBLER__ /* Conversion interfaces. */ # include bits/byteswap.h +# include stdint.h # if __BYTE_ORDER == __LITTLE_ENDIAN # define htobe16(x) __bswap_16 (x) -# define htole16(x) (x) +# define htole16(x) (uint16_t)(x) # define be16toh(x) __bswap_16 (x) -# define le16toh(x) (x) +# define le16toh(x) (uint16_t)(x) # define htobe32(x) __bswap_32 (x) -# define htole32(x) (x) +# define htole32(x) (uint32_t)(x) # define be32toh(x) __bswap_32 (x) -# define le32toh(x) (x) +# define le32toh(x) (uint32_t)(x) # define htobe64(x) __bswap_64 (x) -# define htole64(x) (x) +# define htole64(x) (uint64_t)(x) # define be64toh(x) __bswap_64 (x) -# define le64toh(x) (x) +# define le64toh(x) (uint64_t)(x) # else -# define htobe16(x) (x) +# define htobe16(x) (uint16_t)(x) # define htole16(x) __bswap_16 (x) -# define be16toh(x) (x) +# define be16toh(x) (uint16_t)(x) # define le16toh(x) __bswap_16 (x) -# define htobe32(x) (x) +# define htobe32(x) (uint32_t)(x) # define htole32(x) __bswap_32 (x) -# define be32toh(x) (x) +# define be32toh(x) (uint32_t)(x) # define le32toh(x) __bswap_32 (x) -# define htobe64(x) (x) +# define htobe64(x) (uint64_t)(x) # define htole64(x) __bswap_64 (x) -# define be64toh(x) (x) +# define be64toh(x) (uint64_t)(x) # define le64toh(x) __bswap_64 (x) # endif #endif signature.asc Description: Digital signature
Bug#751410: patches
I'm attaching two patches.
--
libldm-read-shadow-problem.patch
Fixes the shadowing error caused by the redefinition of read (mips and mipsel).
--
libldm-uint64_t-in-big-endian.patch
Fixes the error caused by passing a 32-bit argument (on big endian) when a
64-bit one is expected (mips).
diff -uNr libldm-0.2.3/src/ldm libldm-0.2.3.mine/src/mbr.c
--- libldm-0.2.3/src/mbr.c 2012-09-21 10:34:41.0 +
+++ libldm-0.2.3.mine/src/mbr.c 2014-06-12 14:52:55.306826659 +
@@ -47,13 +47,13 @@
{
struct _mbr _mbr;
-size_t read = 0;
-while (read sizeof(_mbr)) {
-ssize_t in = pread(fd, _mbr + read, sizeof(struct _mbr) - read, read);
+size_t rb = 0;
+while (rb sizeof(_mbr)) {
+ssize_t in = pread(fd, _mbr + rb, sizeof(struct _mbr) - rb, rb);
if (in == 0) return -MBR_ERROR_INVALID;
if (in == -1) return -MBR_ERROR_READ;
-read += in;
+rb += in;
}
if (_mbr.magic[0] != 0x55 || _mbr.magic[1] != 0xAA)
diff -uNr libldm-0.2.3/src/ldm.c libldm-0.2.3.mine/src/ldm.c libldm-uint64_t-in-big-endian.patch
--- libldm-0.2.3/src/ldm.c 2014-06-12 14:59:56.0 +
+++ libldm-0.2.3.mine/src/ldm.c 2014-06-12 14:36:49.538024603 +
@@ -1076,6 +1076,7 @@
return FALSE;
}
+
g_debug(TOCBLOCK: %s\n
Sequence1: % PRIu64 \n
Sequence2: % PRIu64 \n
@@ -1090,25 +1091,25 @@
Size: % PRIu64 \n
Flags2: %016 PRIo64,
path,
-be64toh(tocblock-seq1),
-be64toh(tocblock-seq2),
+(uint64_t)be64toh(tocblock-seq1),
+(uint64_t)be64toh(tocblock-seq2),
tocblock-bitmap[0].name,
-be16toh(tocblock-bitmap[0].flags1),
-be64toh(tocblock-bitmap[0].start),
-be64toh(tocblock-bitmap[0].size),
-be64toh(tocblock-bitmap[0].flags2),
+(uint32_t)be16toh(tocblock-bitmap[0].flags1),
+(uint64_t)be64toh(tocblock-bitmap[0].start),
+(uint64_t)be64toh(tocblock-bitmap[0].size),
+(uint64_t)be64toh(tocblock-bitmap[0].flags2),
tocblock-bitmap[1].name,
-be16toh(tocblock-bitmap[1].flags1),
-be64toh(tocblock-bitmap[1].start),
-be64toh(tocblock-bitmap[1].size),
-be64toh(tocblock-bitmap[1].flags2));
+(uint32_t)be16toh(tocblock-bitmap[1].flags1),
+(uint64_t)be64toh(tocblock-bitmap[1].start),
+(uint64_t)be64toh(tocblock-bitmap[1].size),
+(uint64_t)be64toh(tocblock-bitmap[1].flags2));
/* Find the start of the DB */
*vmdb = NULL;
for (int i = 0; i 2; i++) {
const struct _tocblock_bitmap *bitmap = tocblock-bitmap[i];
if (strcmp(bitmap-name, config) == 0) {
-*vmdb = config + be64toh(tocblock-bitmap[i].start) * secsize;
+*vmdb = config + (uint64_t)be64toh(tocblock-bitmap[i].start) * secsize;
break;
}
}
@@ -1150,8 +1151,8 @@
be16toh((*vmdb)-version_major),
be16toh((*vmdb)-version_minor),
(*vmdb)-disk_group_guid,
-be64toh((*vmdb)-committed_seq),
-be64toh((*vmdb)-pending_seq),
+(uint64_t)be64toh((*vmdb)-committed_seq),
+(uint64_t)be64toh((*vmdb)-pending_seq),
be32toh((*vmdb)-n_committed_vblks_vol),
be32toh((*vmdb)-n_committed_vblks_comp),
be32toh((*vmdb)-n_committed_vblks_part),
@@ -1187,9 +1188,9 @@
}
const uint64_t config_start =
-be64toh(privhead-ldm_config_start) * secsize;
+(uint64_t)be64toh(privhead-ldm_config_start) * secsize;
const uint64_t config_size =
-be64toh(privhead-ldm_config_size) * secsize;
+(uint64_t)be64toh(privhead-ldm_config_size) * secsize;
if (config_start size) {
g_set_error(err, LDM_ERROR, LDM_ERROR_INVALID,
@@ -1276,10 +1277,10 @@
be16toh(privhead-version_minor),
privhead-disk_guid,
privhead-disk_group_guid,
-be64toh(privhead-logical_disk_start),
-be64toh(privhead-logical_disk_size),
-be64toh(privhead-ldm_config_start),
-be64toh(privhead-ldm_config_size));
+(uint64_t)be64toh(privhead-logical_disk_start),
+(uint64_t)be64toh(privhead-logical_disk_size),
+(uint64_t)be64toh(privhead-ldm_config_start),
+(uint64_t)be64toh(privhead-ldm_config_size));
return TRUE;
}
@@ -1650,8 +1651,8 @@
/* Log Commit ID */
vblk += 8;
-part-start = be64toh(*(uint64_t *)vblk); vblk += 8;
-part-vol_offset = be64toh(*(uint64_t *)vblk); vblk += 8;
+part-start = (uint64_t)be64toh(*(uint64_t *)vblk); vblk += 8;
+part-vol_offset = (uint64_t)be64toh(*(uint64_t *)vblk); vblk += 8;
if (!_parse_var_int64(vblk, part-size, size, partition, err))
return FALSE;
@@ -1861,7 +1862,7 @@
GArray
Bug#751228: patch
The output of /proc/cpuinfo on MIPS was not as this program expected.
I'm uploading a patch that fixes the parsing of the output
diff -Nur libffado-2.2.1/SConstruct libffado-2.2.1.mine/SConstruct
--- libffado-2.2.1/SConstruct 2014-06-02 00:01:27.0 +
+++ libffado-2.2.1.mine/SConstruct 2014-06-09 17:16:30.038566814 +
@@ -514,7 +514,7 @@
for line in f:
line = line.strip()
if line:
-k,v = line.split(':')
+k,v = line.split(':', 1)
yield (k.strip(), v.strip())
f.close()
signature.asc
Description: Digital signature
Bug#748685: bibletime update required
There is a new version of bibletime (2.10) which is working with libsword 1.7. I strongly recommend to update bibletime - this should fix the problem. If you have some reason not to update it, I can create a patch for 2.9. signature.asc Description: Digital signature
Bug#750998: ck mips* patch
Added configure and build support for mips* architectures. signature.asc Description: Digital signature
Bug#750998: ck mips* patch (retry)
Added configure and build support for mips* architectures.
This time with the patch attached :)
diff -Nru ck-0.4.2/build/ck.build.mips ck-0.4.2.mine/build/ck.build.mips
--- ck-0.4.2/build/ck.build.mips 1970-01-01 00:00:00.0 +
+++ ck-0.4.2.mine/build/ck.build.mips 2014-06-06 13:25:34.627333492 +
@@ -0,0 +1 @@
+CFLAGS+=-D__mips__
diff -Nru ck-0.4.2/configure ck-0.4.2.mine/configure
--- ck-0.4.2/configure 2014-04-22 17:36:30.0 +
+++ ck-0.4.2.mine/configure 2014-06-06 13:24:43.391406739 +
@@ -392,6 +392,18 @@
;;
esac
;;
+ mips|mipsel)
+ RTM_ENABLE=CK_MD_RTM_DISABLE
+ PLATFORM=mips
+ ENVIRONMENT=32
+ MM=${MM:-CK_MD_TSO}
+ ;;
+ mips64|mips64el)
+ RTM_ENABLE=CK_MD_RTM_DISABLE
+ PLATFORM=mips
+ ENVIRONMENT=64
+ MM=${MM:-CK_MD_TSO}
+ ;;
amd64|x86_64)
PLATFORM=x86_64
ENVIRONMENT=64
signature.asc
Description: Digital signature
Bug#751011: minidlna mips patch
fixed minidlna compilation on mips
diff -uNr minidlna-1.1.2+dfsg/metadata.c minidlna-1.1.2+dfsg.mine/metadata.c
--- minidlna-1.1.2+dfsg/metadata.c 2014-04-21 21:06:07.0 +
+++ minidlna-1.1.2+dfsg.mine/metadata.c 2014-06-09 13:34:54.0 +
@@ -772,10 +772,10 @@
aac_object_type_t aac_type = AAC_INVALID;
switch( ac-codec_id )
{
- case CODEC_ID_MP3:
+ case AV_CODEC_ID_MP3:
audio_profile = PROFILE_AUDIO_MP3;
break;
- case CODEC_ID_AAC:
+ case AV_CODEC_ID_AAC:
if( !ac-extradata_size ||
!ac-extradata )
{
@@ -816,12 +816,12 @@
break;
}
break;
- case CODEC_ID_AC3:
- case CODEC_ID_DTS:
+ case AV_CODEC_ID_AC3:
+ case AV_CODEC_ID_DTS:
audio_profile = PROFILE_AUDIO_AC3;
break;
- case CODEC_ID_WMAV1:
- case CODEC_ID_WMAV2:
+ case AV_CODEC_ID_WMAV1:
+ case AV_CODEC_ID_WMAV2:
/* WMA Baseline: stereo, up to 48 KHz, up to 192,999 bps */
if ( ac-bit_rate = 193000 )
audio_profile = PROFILE_AUDIO_WMA_BASE;
@@ -830,19 +830,19 @@
audio_profile = PROFILE_AUDIO_WMA_FULL;
break;
#if LIBAVCODEC_VERSION_INT ((5116)+(508)+1)
- case CODEC_ID_WMAPRO:
+ case AV_CODEC_ID_WMAPRO:
audio_profile = PROFILE_AUDIO_WMA_PRO;
break;
#endif
- case CODEC_ID_MP2:
+ case AV_CODEC_ID_MP2:
audio_profile = PROFILE_AUDIO_MP2;
break;
- case CODEC_ID_AMR_NB:
+ case AV_CODEC_ID_AMR_NB:
audio_profile = PROFILE_AUDIO_AMR;
break;
default:
-if( (ac-codec_id = CODEC_ID_PCM_S16LE)
-(ac-codec_id CODEC_ID_ADPCM_IMA_QT) )
+if( (ac-codec_id = AV_CODEC_ID_PCM_S16LE)
+(ac-codec_id AV_CODEC_ID_ADPCM_IMA_QT) )
audio_profile = PROFILE_AUDIO_PCM;
else
DPRINTF(E_DEBUG, L_METADATA, Unhandled audio codec [0x%X]\n, ac-codec_id);
@@ -879,7 +879,7 @@
if( strcmp(ctx-iformat-name, avi) == 0 )
{
xasprintf(m.mime, video/x-msvideo);
- if( vc-codec_id == CODEC_ID_MPEG4 )
+ if( vc-codec_id == AV_CODEC_ID_MPEG4 )
{
fourcc[0] = vc-codec_tag 0xff;
fourcc[1] = vc-codec_tag8 0xff;
@@ -903,7 +903,7 @@
switch( vc-codec_id )
{
- case CODEC_ID_MPEG1VIDEO:
+ case AV_CODEC_ID_MPEG1VIDEO:
if( strcmp(ctx-iformat-name, mpeg) == 0 )
{
if( (vc-width == 352)
@@ -914,7 +914,7 @@
xasprintf(m.mime, video/mpeg);
}
break;
- case CODEC_ID_MPEG2VIDEO:
+ case AV_CODEC_ID_MPEG2VIDEO:
m.dlna_pn = malloc(64);
off = sprintf(m.dlna_pn, MPEG_);
if( strcmp(ctx-iformat-name, mpegts) == 0 )
@@ -987,7 +987,7 @@
m.dlna_pn = NULL;
}
break;
- case CODEC_ID_H264:
+ case AV_CODEC_ID_H264:
m.dlna_pn = malloc(128);
off = sprintf(m.dlna_pn, AVC_);
@@ -1005,11 +1005,11 @@
vc-height * vc-sample_aspect_ratio.den,
1024*1024);
}
- if (ctx-streams[video_stream]-r_frame_rate.den)
- fps = ctx-streams[video_stream]-r_frame_rate.num / ctx-streams[video_stream]-r_frame_rate.den;
+ if (ctx-streams[video_stream]-avg_frame_rate.den)
+ fps = ctx-streams[video_stream]-avg_frame_rate.num / ctx-streams[video_stream]-avg_frame_rate.den;
else
fps = 0;
- interlaced = vc-time_base.den ? (ctx-streams[video_stream]-r_frame_rate.num / vc-time_base.den) : 0;
+ interlaced = vc-time_base.den ? (ctx-streams[video_stream]-avg_frame_rate.num / vc-time_base.den) : 0;
if( vc-width == 1920 || vc-width == 1440) vc-height == 1080) ||
(vc-width == 720 vc-height == 480)) fps == 59 interlaced) ||
((vc-width == 1280 vc-height == 720) fps == 59 !interlaced) )
@@ -1298,7 +1298,7 @@
}
DPRINTF(E_DEBUG, L_METADATA, Stream %d of %s is h.264\n, video_stream, basepath);
break;
- case CODEC_ID_MPEG4:
+ case AV_CODEC_ID_MPEG4:
fourcc[0] = vc-codec_tag 0xff;
fourcc[1] = vc-codec_tag8 0xff;
fourcc[2] = vc-codec_tag16 0xff;
@@ -1361,7 +1361,7 @@
}
}
break;
- case CODEC_ID_WMV3:
+ case AV_CODEC_ID_WMV3:
/* I'm not 100% sure this is correct, but it works on everything I could get my hands on */
if( vc-extradata_size 0 )
{
@@ -1370,7 +1370,7 @@
if( !((vc-extradata[0] 6) 1) )
vc-profile = 0;
}
- case CODEC_ID_VC1:
+ case AV_CODEC_ID_VC1:
if( strcmp(ctx-iformat-name, asf) != 0 )
{
DPRINTF(E_DEBUG, L_METADATA, Skipping DLNA parsing for non-ASF VC1 file %s\n, path);
@@ -1469,7 +1469,7 @@
}
}
break;
- case CODEC_ID_MSMPEG4V3:
+ case AV_CODEC_ID_MSMPEG4V3:
xasprintf(m.mime, video/x-msvideo);
default:
DPRINTF(E_DEBUG, L_METADATA, Stream %d of %s is %s [type %d]\n,
signature.asc
Description: Digital signature
Bug#751022: routino patch for mips
I'm sending a patch that fixes the compilation on mips
diff -Nur routino-2.7/debian/control routino-2.7.mine/debian/control
--- routino-2.7/debian/control 2014-04-22 05:33:54.0 +
+++ routino-2.7.mine/debian/control 2014-06-06 13:21:37.565939508 +
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Thibaut Gridel tgri...@free.fr
Uploaders: Uwe Steinmann ste...@debian.org
-Build-Depends: debhelper (= 7.0.50~), flex, libbz2-dev
+Build-Depends: debhelper (= 7.0.50~), flex, libbz2-dev, zlib1g-dev
Standards-Version: 3.9.5
Homepage: http://www.routino.org/
Vcs-Git: git://git.debian.org/pkg-grass/routino.git
@@ -12,7 +12,7 @@
Package: routino
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: zlib1g, ${shlibs:Depends}, ${misc:Depends}
Description: Set of tools to find a path between two points.
Routino is an application for finding a route between two points
using the dataset of topographical information collected by
signature.asc
Description: Digital signature
