Merge pull request #3410 from Rmys/master
dvd+rw-tools, simpleburn :new toolchain
This commit is contained in:
@@ -0,0 +1,24 @@
|
|||||||
|
diff -up wrk/dao/CdrDriver.cc.wrk wrk/dao/CdrDriver.cc
|
||||||
|
--- wrk/dao/CdrDriver.cc.wrk 2016-02-16 14:06:23.158392345 +0100
|
||||||
|
+++ wrk/dao/CdrDriver.cc 2016-02-16 14:07:11.654597254 +0100
|
||||||
|
@@ -495,7 +495,7 @@ unsigned char CdrDriver::syncPattern[12]
|
||||||
|
0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0
|
||||||
|
};
|
||||||
|
|
||||||
|
-char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 };
|
||||||
|
+unsigned char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 };
|
||||||
|
|
||||||
|
|
||||||
|
/* Maps a string to the corresponding driver option value
|
||||||
|
diff -up wrk/dao/CdrDriver.h.wrk wrk/dao/CdrDriver.h
|
||||||
|
--- wrk/dao/CdrDriver.h.wrk 2016-02-16 14:21:18.454174199 +0100
|
||||||
|
+++ wrk/dao/CdrDriver.h 2016-02-16 14:21:42.381275268 +0100
|
||||||
|
@@ -440,7 +440,7 @@ protected:
|
||||||
|
bool fullBurn_;
|
||||||
|
|
||||||
|
static unsigned char syncPattern[12];
|
||||||
|
- static char REMOTE_MSG_SYNC_[4];
|
||||||
|
+ static unsigned char REMOTE_MSG_SYNC_[4];
|
||||||
|
|
||||||
|
static int speed2Mult(int);
|
||||||
|
static int mult2Speed(int);
|
||||||
@@ -23,6 +23,7 @@
|
|||||||
<Patch level="1">cdrdao-1.2.3-version.patch</Patch>
|
<Patch level="1">cdrdao-1.2.3-version.patch</Patch>
|
||||||
<Patch level="1">cdrdao-1.2.3-stat.patch</Patch>
|
<Patch level="1">cdrdao-1.2.3-stat.patch</Patch>
|
||||||
<Patch level="1">cdrdao-1.2.3-autoconf-update.patch</Patch>
|
<Patch level="1">cdrdao-1.2.3-autoconf-update.patch</Patch>
|
||||||
|
<Patch level="1">cdrdao-1.2.3-narrowing.patch</Patch>
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -43,6 +44,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="3">
|
||||||
|
<Date>2017-04-14</Date>
|
||||||
|
<Version>1.2.3</Version>
|
||||||
|
<Comment>Rebuild with new toolchain</Comment>
|
||||||
|
<Name>Pisi Linux Community</Name>
|
||||||
|
<Email>admin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="2">
|
<Update release="2">
|
||||||
<Date>2016-06-09</Date>
|
<Date>2016-06-09</Date>
|
||||||
<Version>1.2.3</Version>
|
<Version>1.2.3</Version>
|
||||||
|
|||||||
@@ -36,6 +36,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="2">
|
||||||
|
<Date>2017-04-13</Date>
|
||||||
|
<Version>7.1</Version>
|
||||||
|
<Comment>Rebuild with new toolchain</Comment>
|
||||||
|
<Name>Pisi Linux Admins</Name>
|
||||||
|
<Email>admins@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="1">
|
<Update release="1">
|
||||||
<Date>2016-10-09</Date>
|
<Date>2016-10-09</Date>
|
||||||
<Version>7.1</Version>
|
<Version>7.1</Version>
|
||||||
@@ -44,4 +51,4 @@
|
|||||||
<Email>admins@pisilinux.org</Email>
|
<Email>admins@pisilinux.org</Email>
|
||||||
</Update>
|
</Update>
|
||||||
</History>
|
</History>
|
||||||
</PISI>
|
</PISI>
|
||||||
|
|||||||
@@ -58,6 +58,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="4">
|
||||||
|
<Date>2017-04-13</Date>
|
||||||
|
<Version>1.6.5</Version>
|
||||||
|
<Comment>Rebuild with new toolchain</Comment>
|
||||||
|
<Name>Pisi Linux Community</Name>
|
||||||
|
<Email>admin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="3">
|
<Update release="3">
|
||||||
<Date>2016-06-09</Date>
|
<Date>2016-06-09</Date>
|
||||||
<Version>1.6.5</Version>
|
<Version>1.6.5</Version>
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
--- libetonyek-0.1.6/configure.ac
|
||||||
|
+++ libetonyek-0.1.6/configure.ac
|
||||||
|
@@ -24,8 +24,8 @@ AC_LANG([C++])
|
||||||
|
# Configure options
|
||||||
|
# =================
|
||||||
|
AC_ARG_WITH([mdds],
|
||||||
|
- AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
|
||||||
|
- [], [with_mdds="1.0"])
|
||||||
|
+ AS_HELP_STRING([--with-mdds=1.2|0.x], [Specify which version of mdds to use (1.2 is the default)]),
|
||||||
|
+ [], [with_mdds="1.2"])
|
||||||
|
|
||||||
|
# ===========================
|
||||||
|
# Find required base packages
|
||||||
|
@@ -47,7 +47,7 @@ AC_PROG_SED
|
||||||
|
|
||||||
|
AM_MISSING_PROG([GPERF], [gperf])
|
||||||
|
|
||||||
|
-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
|
||||||
|
+AS_IF([test "$with_mdds" != "0.x"], [AX_CXX_COMPILE_STDCXX_11([noext])])
|
||||||
|
|
||||||
|
# ===============
|
||||||
|
# Find librevenge
|
||||||
|
@@ -138,8 +138,8 @@ AC_SUBST([GLM_CFLAGS])
|
||||||
|
# =========
|
||||||
|
# Find mdds
|
||||||
|
# =========
|
||||||
|
-AS_IF([test "$with_mdds" = "1.0"], [
|
||||||
|
- PKG_CHECK_MODULES([MDDS], [mdds-1.0])
|
||||||
|
+AS_IF([test "$with_mdds" != "0.x"], [
|
||||||
|
+ PKG_CHECK_MODULES([MDDS], [mdds-][$with_mdds])
|
||||||
|
], [
|
||||||
|
PKG_CHECK_MODULES([MDDS], [mdds])
|
||||||
|
AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
|
||||||
@@ -25,6 +25,9 @@
|
|||||||
<Dependency>mdds-devel</Dependency>
|
<Dependency>mdds-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Archive sha1sum="c2f8420f1e77141097a10a33d3b83d41c38b65f1" type="tarxz">http://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.6.tar.xz</Archive>
|
<Archive sha1sum="c2f8420f1e77141097a10a33d3b83d41c38b65f1" type="tarxz">http://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.6.tar.xz</Archive>
|
||||||
|
<Patches>
|
||||||
|
<Patch level="1">libetonyek-0.1.6-mdds-1.2.patch</Patch>
|
||||||
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
<Package>
|
<Package>
|
||||||
@@ -59,7 +62,7 @@
|
|||||||
|
|
||||||
<History>
|
<History>
|
||||||
<Update release="1">
|
<Update release="1">
|
||||||
<Date>2017-04-11</Date>
|
<Date>2017-04-14</Date>
|
||||||
<Version>0.1.6</Version>
|
<Version>0.1.6</Version>
|
||||||
<Comment>Rebuild</Comment>
|
<Comment>Rebuild</Comment>
|
||||||
<Name>Alihan Öztürk</Name>
|
<Name>Alihan Öztürk</Name>
|
||||||
|
|||||||
Reference in New Issue
Block a user