Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/794f12e4b5236cb686f61fa18968455b4c960d66
...commit
http://git.netsurf-browser.org/netsurf.git/commit/794f12e4b5236cb686f61fa18968455b4c960d66
...tree
http://git.netsurf-browser.org/netsurf.git/tree/794f12e4b5236cb686f61fa18968455b4c960d66
The branch, master has been updated
via 794f12e4b5236cb686f61fa18968455b4c960d66 (commit)
via bb87d63f0299df524c861e523f22ee6efb17af4c (commit)
via 7fe13d5afada707cd2f7fd6e33d288bef3383474 (commit)
from 6a9a8d6127e3fd677dc8ad28d14b4d84b3dfdc40 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=794f12e4b5236cb686f61fa18968455b4c960d66
commit 794f12e4b5236cb686f61fa18968455b4c960d66
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Add missing files
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 63a2406..60fb222 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -142,6 +142,7 @@
#include "amiga/login.h"
#include "amiga/menu.h"
#include "amiga/misc.h"
+#include "amiga/nsoption.h"
#include "amiga/plotters.h"
#include "amiga/plugin_hack.h"
#include "amiga/print.h"
diff --git a/frontends/amiga/nsoption.c b/frontends/amiga/nsoption.c
new file mode 100644
index 0000000..69b59bc
--- /dev/null
+++ b/frontends/amiga/nsoption.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 Chris Young <[email protected]>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "amiga/os3support.h"
+
+#include <proto/exec.h>
+#include <proto/utility.h>
+
+#include "utils/nsoption.h"
+#include "amiga/nsoption.h"
+
+static char *current_user_options = NULL;
+
+nserror ami_nsoption_read(void)
+{
+ return nsoption_read(current_user_options, NULL);
+}
+
+nserror ami_nsoption_write(void)
+{
+ return nsoption_write(current_user_options, NULL, NULL);
+}
+
+nserror ami_nsoption_set_location(const char *current_user_dir)
+{
+ nserror err = NSERROR_OK;
+
+ ami_nsoption_free();
+
+ current_user_options = ASPrintf("%s/Choices", current_user_dir);
+ if(current_user_options == NULL)
+ err = NSERROR_NOMEM;
+
+ return err;
+}
+
+void ami_nsoption_free(void)
+{
+ if(current_user_options != NULL)
+ FreeVec(current_user_options);
+
+ current_user_options = NULL;
+}
+
diff --git a/frontends/amiga/nsoption.h b/frontends/amiga/nsoption.h
new file mode 100644
index 0000000..c3a3b56
--- /dev/null
+++ b/frontends/amiga/nsoption.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2016 Chris Young <[email protected]>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AMIGA_NSOPTION_H
+#define AMIGA_NSOPTION_H 1
+#include "utils/errors.h"
+
+nserror ami_nsoption_read(void);
+nserror ami_nsoption_write(void);
+nserror ami_nsoption_set_location(const char *current_user_dir);
+void ami_nsoption_free(void);
+#endif
+
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=bb87d63f0299df524c861e523f22ee6efb17af4c
commit bb87d63f0299df524c861e523f22ee6efb17af4c
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Force disable libjpeg-turbo's use of AltiVec if we don't have it
NB: This var must be set when NetSurf is launched. The in-program setting
is just a precaution in case the install script isn't run
diff --git a/frontends/amiga/dist/Install b/frontends/amiga/dist/Install
index e8d9d0e..5563190 100755
--- a/frontends/amiga/dist/Install
+++ b/frontends/amiga/dist/Install
@@ -289,6 +289,16 @@
(complete 75)
+; Force disable use of AltiVec if we don't have it
+(if (database "vectorunit" "0")
+ (
+ (textfile
+ (dest "ENVARC:JSIMD_FORCENONE")
+ (append "1")
+ )
+ )
+)
+
(if (= (exists "ENVARC:Sys/def_css.info") 0)
(copyfiles
(prompt "Copying default CSS icon")
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 688aa59..63a2406 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -5553,7 +5553,7 @@ int main(int argc, char** argv)
LOG("AltiVec detected");
} else {
LOG("AltiVec NOT detected");
- SetVar("JSIMD_FORCENONE", "1", 1, GVF_LOCAL_ONLY);
+ SetVar("JSIMD_FORCENONE", "1", 1, GVF_GLOBAL_ONLY |
GVF_SAVE_VAR);
}
#endif
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7fe13d5afada707cd2f7fd6e33d288bef3383474
commit 7fe13d5afada707cd2f7fd6e33d288bef3383474
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Set envvar to the correct value
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 815ffb7..688aa59 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -5553,7 +5553,7 @@ int main(int argc, char** argv)
LOG("AltiVec detected");
} else {
LOG("AltiVec NOT detected");
- SetVar("JSIMD_FORCENONE", "0", 1, GVF_LOCAL_ONLY);
+ SetVar("JSIMD_FORCENONE", "1", 1, GVF_LOCAL_ONLY);
}
#endif
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/dist/Install | 10 ++++
frontends/amiga/gui.c | 3 +-
frontends/amiga/nsoption.c | 59 +++++++++++++++++++++++
frontends/amiga/{font_diskfont.h => nsoption.h} | 11 +++--
4 files changed, 79 insertions(+), 4 deletions(-)
create mode 100644 frontends/amiga/nsoption.c
copy frontends/amiga/{font_diskfont.h => nsoption.h} (75%)
diff --git a/frontends/amiga/dist/Install b/frontends/amiga/dist/Install
index e8d9d0e..5563190 100755
--- a/frontends/amiga/dist/Install
+++ b/frontends/amiga/dist/Install
@@ -289,6 +289,16 @@
(complete 75)
+; Force disable use of AltiVec if we don't have it
+(if (database "vectorunit" "0")
+ (
+ (textfile
+ (dest "ENVARC:JSIMD_FORCENONE")
+ (append "1")
+ )
+ )
+)
+
(if (= (exists "ENVARC:Sys/def_css.info") 0)
(copyfiles
(prompt "Copying default CSS icon")
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 815ffb7..60fb222 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -142,6 +142,7 @@
#include "amiga/login.h"
#include "amiga/menu.h"
#include "amiga/misc.h"
+#include "amiga/nsoption.h"
#include "amiga/plotters.h"
#include "amiga/plugin_hack.h"
#include "amiga/print.h"
@@ -5553,7 +5554,7 @@ int main(int argc, char** argv)
LOG("AltiVec detected");
} else {
LOG("AltiVec NOT detected");
- SetVar("JSIMD_FORCENONE", "0", 1, GVF_LOCAL_ONLY);
+ SetVar("JSIMD_FORCENONE", "1", 1, GVF_GLOBAL_ONLY |
GVF_SAVE_VAR);
}
#endif
diff --git a/frontends/amiga/nsoption.c b/frontends/amiga/nsoption.c
new file mode 100644
index 0000000..69b59bc
--- /dev/null
+++ b/frontends/amiga/nsoption.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 Chris Young <[email protected]>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "amiga/os3support.h"
+
+#include <proto/exec.h>
+#include <proto/utility.h>
+
+#include "utils/nsoption.h"
+#include "amiga/nsoption.h"
+
+static char *current_user_options = NULL;
+
+nserror ami_nsoption_read(void)
+{
+ return nsoption_read(current_user_options, NULL);
+}
+
+nserror ami_nsoption_write(void)
+{
+ return nsoption_write(current_user_options, NULL, NULL);
+}
+
+nserror ami_nsoption_set_location(const char *current_user_dir)
+{
+ nserror err = NSERROR_OK;
+
+ ami_nsoption_free();
+
+ current_user_options = ASPrintf("%s/Choices", current_user_dir);
+ if(current_user_options == NULL)
+ err = NSERROR_NOMEM;
+
+ return err;
+}
+
+void ami_nsoption_free(void)
+{
+ if(current_user_options != NULL)
+ FreeVec(current_user_options);
+
+ current_user_options = NULL;
+}
+
diff --git a/frontends/amiga/font_diskfont.h b/frontends/amiga/nsoption.h
similarity index 75%
copy from frontends/amiga/font_diskfont.h
copy to frontends/amiga/nsoption.h
index de19e94..c3a3b56 100644
--- a/frontends/amiga/font_diskfont.h
+++ b/frontends/amiga/nsoption.h
@@ -16,8 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef AMIGA_FONT_DISKFONT_H
-#define AMIGA_FONT_DISKFONT_H
-void ami_font_diskfont_init(void);
+#ifndef AMIGA_NSOPTION_H
+#define AMIGA_NSOPTION_H 1
+#include "utils/errors.h"
+
+nserror ami_nsoption_read(void);
+nserror ami_nsoption_write(void);
+nserror ami_nsoption_set_location(const char *current_user_dir);
+void ami_nsoption_free(void);
#endif
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
